diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 2e6335a92cc31..ad5e6c795e6cc 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -14,12 +14,24 @@ pom + 1.0.0 1.72 1.0.2.3 1.0.14.1 + 5.0.0 3.0.2 + 3.0.0 + 2.1.0 + 5.0.1 + 2.1.1 + 3.1.0 3.0.5 - 4.7.7.Final + 1.3.2 + 1 + 1.1.1 + 2.0.0.Final + 3.0.0.Beta3 + 6.2.1.Final 0.33.0 0.2.4 0.1.15 @@ -29,54 +41,48 @@ 1.22.0-alpha 1.22.0 1.8.1 - 4.2.1 + 5.0.0.Alpha3 1.10.3 2.1.12 0.22.0 - 2.0.1 - 3.0.1 - 1.2 - 2.0 + 3.0 + 4.0.1 + 1.3 + 3.0 1.0.1 - 2.0 - 1.2 - 1.0 - 2.0.1 - 1.13.2 - 2.13.2 - 3.3.1 - 3.0.5 + 3.0 + 2.0 + 2.0-RC1 + 3.0 + 2.0.0 + 3.1.2 + 4.0.1 + 4.0.0 3.1.1 - 1.9.1 - 2.1.1 - 5.6.0 - 3.6.0 - 1.2.2 + 2.1.0.Beta1 + 3.0.0 + 6.1.0 + 4.0.0 + 2.0.0 1.0.13 - 2.7.0 - 2.30.1 - 3.23.0 + 3.0.0 + 3.2.0 + 4.2.0.RC1 1.4.1 - 1.2.1 - 1.3.5 - 3.0.4 - 2.0.2 - 1.0 - 1.2.5 - 1.1.6 - 1.0.2 - 1.6.7 - 2.2.3 - 1.6.1 - 1.1.3 - 4.0.3 - 1.3.3 - 2.0.2 - 1.1.2 - 2.3.3 - 2.3.3-b02 - 2.0.1.Final - 2.0.0.Final + 2.1.0 + 2.1.1 + 4.0.1 + 2.0.1 + 2.1.0 + 3.0.0 + 2.0.1 + 3.0.0 + 6.0.0 + 2.0.1 + 3.0.2 + 2.1.0 + 4.0.0 + 4.0.1 9.4 2.11.0 15.4.0 @@ -94,11 +100,11 @@ 5.6.14.Final 1.12.18 1.1.9.Final - 6.2.5.Final + 8.0.0.Final 6.1.7.Final - 5.13.1.Final + 6.0.0.CR1 1.1.1.Final - 1.16 + 2.0 7.6.0.Final 8.6.1 @@ -111,7 +117,7 @@ 1.2.0.Final 1.5.4.Final-format-001 1.0.1.Final - 1.20.1.Final + 2.0.0.Final 3.4.3.Final 4.3.7 @@ -138,9 +144,9 @@ 3.1.1 4.1.87.Final 1.8.0 - 1.0.3 + 1.0.4 3.5.0.Final - 1.9.0 + 2.1.0 3.3.2 1.8.0 1.1.8.4 @@ -158,9 +164,9 @@ 3.3.1 3.2.0 4.2.0 - 1.0.11 + 1.1.1 9.14.1 - 1.0.11 + 3.0.2 4.19.0 1.33 6.0.0 @@ -179,7 +185,7 @@ 5.1.1 5.8.0 4.10.1 - 1.1.4.Final + 2.0.0.Alpha2 20.0.3 1.15.0 3.29.0 @@ -210,6 +216,7 @@ 0.1.3 2.9.2 0.8.9 + 1.0.0 @@ -929,12 +936,12 @@ io.quarkus quarkus-liquibase ${project.version} - + io.quarkus quarkus-liquibase-deployment ${project.version} - + io.quarkus quarkus-liquibase-mongodb @@ -3239,9 +3246,9 @@ ${classmate.version} - com.sun.activation - jakarta.activation - ${jakarta.activation.version} + org.eclipse.angus + angus-activation + ${angus-activation.version} io.jaegertracing @@ -3723,12 +3730,6 @@ io.smallrye smallrye-health ${smallrye-health.version} - - - jakarta.json - jakarta.json-api - - io.smallrye @@ -4011,6 +4012,21 @@ jakarta.annotation-api ${jakarta.annotation-api.version} + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication-api} + + + jakarta.authorization + jakarta.authorization-api + ${jakarta.authorization-api.version} + + + jakarta.el + jakarta.el-api + ${jakarta.el-api.version} + com.sun.mail jakarta.mail @@ -4050,14 +4066,9 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${jboss-jaxb-api_2.3_spec.version} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${jboss-jaxrs-api_2.1_spec.version} + jakarta.json + jakarta.json-api + ${jakarta.json-api.version} org.apache.qpid @@ -4279,17 +4290,15 @@ microprofile-rest-client-api ${microprofile-rest-client.version} + + org.eclipse.parsson + parsson + ${parsson.version} + org.eclipse yasson ${yasson.version} - - - - jakarta.json - jakarta.json-api - - org.eclipse.microprofile.jwt @@ -4308,14 +4317,9 @@ ${microprofile-openapi.version} - org.glassfish - jakarta.el - ${jakarta.el-impl.version} - - - org.glassfish - jakarta.json - ${jakarta.json.version} + org.glassfish.expressly + expressly + ${expressly.version} jakarta.json.bind @@ -4333,20 +4337,25 @@ ${jakarta.xml.bind-api.version} - jakarta.security.jacc - jakarta.security.jacc-api - ${jakarta.security.jacc-api.version} + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} - jakarta.security.auth.message - jakarta.security.auth.message-api - ${jakarta.security.auth.message-api.version} + javax.inject + javax.inject + ${javax.inject.version} jakarta.websocket jakarta.websocket-api ${jakarta.websocket-api.version} + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} + org.graalvm.sdk graal-sdk @@ -4540,9 +4549,9 @@ - org.jboss.resteasy - resteasy-client-microprofile - ${resteasy.version} + org.jboss.resteasy.microprofile + microprofile-rest-client + ${resteasy-microprofile.version} org.eclipse.microprofile.config @@ -4554,25 +4563,11 @@ org.jboss.resteasy resteasy-json-binding-provider ${resteasy.version} - - - - jakarta.json - jakarta.json-api - - org.jboss.resteasy resteasy-json-p-provider ${resteasy.version} - - - - jakarta.json - jakarta.json-api - - org.jboss.resteasy @@ -4601,9 +4596,9 @@ ${resteasy.version} - org.jboss.resteasy + org.jboss.resteasy.spring resteasy-spring-web - ${resteasy.version} + ${resteasy-spring-web.version} org.jboss.spec.javax.annotation @@ -4615,6 +4610,11 @@ + + org.jboss.resteasy.microprofile + microprofile-config + ${resteasy-microprofile.version} + org.jboss.resteasy resteasy-links @@ -4989,7 +4989,7 @@ org.hibernate - hibernate-core + hibernate-core-jakarta ${hibernate-orm.version} @@ -5005,22 +5005,22 @@ org.hibernate - hibernate-envers + hibernate-envers-jakarta ${hibernate-orm.version} org.hibernate - hibernate-jpamodelgen + hibernate-jpamodelgen-jakarta ${hibernate-orm.version} org.hibernate.reactive - hibernate-reactive-core + hibernate-reactive-core-jakarta ${hibernate-reactive.version} org.hibernate - quarkus-local-cache + quarkus-local-cache-jakarta ${hibernate-quarkus-local-cache.version} @@ -5035,12 +5035,12 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-coordination-outbox-polling-jakarta ${hibernate-search.version} org.hibernate.search - hibernate-search-mapper-orm + hibernate-search-mapper-orm-jakarta ${hibernate-search.version} @@ -5351,10 +5351,11 @@ org.infinispan infinispan-core ${infinispan.version} + jakarta org.infinispan - infinispan-client-hotrod + infinispan-client-hotrod-jakarta ${infinispan.version} @@ -5387,6 +5388,7 @@ infinispan-core ${infinispan.version} test-jar + jakarta org.infinispan @@ -5396,7 +5398,7 @@ org.infinispan - infinispan-commons + infinispan-commons-jakarta ${infinispan.version} @@ -5450,6 +5452,11 @@ + + io.smallrye.reactive + mutiny-zero-flow-adapters + ${mutiny-zero.version} + org.eclipse.microprofile.reactive-streams-operators microprofile-reactive-streams-operators-api @@ -5707,7 +5714,7 @@ org.keycloak - keycloak-admin-client + keycloak-admin-client-jakarta ${keycloak.version} diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 1c5fc8a625993..d94bd0fcc607c 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -41,7 +41,7 @@ 2.70.0 3.24.2 2.0.3.Final - 5.2.8 + 6.0.1 2.3.32 @@ -360,7 +360,6 @@ org.apache.activemq artemis-server ${artemis.version} - test @@ -383,29 +382,18 @@ commons-logging commons-logging - - - jakarta.json - jakarta.json-api - org.apache.activemq artemis-amqp-protocol ${artemis.version} - test org.apache.activemq artemis-server - - - jakarta.json - jakarta.json-api - diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java b/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java index fd6105199dc7d..0c2e6c92a9bbf 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java @@ -43,7 +43,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java index 5cd4dc005ec28..c75ec59494ed8 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java @@ -208,7 +208,7 @@ public static class DefaultIgnoreTypePredicate implements Predicate { public static final DefaultIgnoreTypePredicate INSTANCE = new DefaultIgnoreTypePredicate(); private static final List DEFAULT_IGNORED_PACKAGES = Arrays.asList("java.", "io.reactivex.", - "org.reactivestreams.", "org.slf4j.", "javax.json.", "jakarta.json.", + "org.reactivestreams.", "org.slf4j.", "jakarta.json.", "jakarta.json.", "com.fasterxml.jackson.databind.", "io.vertx.core.json."); // if this gets more complicated we will need to move to some tree like structure static final Set ALLOWED_FROM_IGNORED_PACKAGES = new HashSet<>( diff --git a/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java b/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java index f34f64c6f9c16..7b379d7c1d5af 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/proxy/ProxyFactory.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.FieldDescriptor; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java index 280939bd38842..205001029f4df 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java index e6a776439e17b..12fa10e419b1f 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java @@ -42,7 +42,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ArrayType; diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java index 79a69b073fd98..58d9740842aa2 100644 --- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java +++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java @@ -81,7 +81,7 @@ public Object instance(Class clazz, Annotation... qualifiers) { try { Class actualClass = Class.forName(clazz.getName(), true, classLoader); - Class cdi = classLoader.loadClass("javax.enterprise.inject.spi.CDI"); + Class cdi = classLoader.loadClass("jakarta.enterprise.inject.spi.CDI"); Object instance = cdi.getMethod("current").invoke(null); Method selectMethod = cdi.getMethod("select", Class.class, Annotation[].class); Object cdiInstance = selectMethod.invoke(instance, actualClass, qualifiers); diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithNonSerializableInjectedInConstructor.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithNonSerializableInjectedInConstructor.java index e1b511953e9af..7b6ab8c56eedd 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithNonSerializableInjectedInConstructor.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithNonSerializableInjectedInConstructor.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.recording; -import javax.inject.Inject; +import jakarta.inject.Inject; public class TestRecorderWithNonSerializableInjectedInConstructor { diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithTestJavaBeanInjectedInConstructor.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithTestJavaBeanInjectedInConstructor.java index def6ebb00fc6e..1be6a084210d8 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithTestJavaBeanInjectedInConstructor.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorderWithTestJavaBeanInjectedInConstructor.java @@ -1,6 +1,6 @@ package io.quarkus.deployment.recording; -import javax.inject.Inject; +import jakarta.inject.Inject; public class TestRecorderWithTestJavaBeanInjectedInConstructor { diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index c8aefbc0bee62..68676bbf45c2f 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -194,26 +194,6 @@ org.opentest4j:opentest4j org.junit.platform:junit-platform-commons - - au.com.dius:pact-jvm-provider-junit5 - au.com.dius:pact-jvm-provider - au.com.dius:pact-jvm-core-support - au.com.dius:pact-jvm-core-pact-broker - au.com.dius:pact-jvm-core-model - au.com.dius:pact-jvm-core-matchers - au.com.dius:pact-jvm-junit5 - au.com.dius:pact-jvm-consumer-java8 - au.com.dius:pact-jvm-consumer - - au.com.dius.pact.provider:junit5 - au.com.dius.pact:provider - au.com.dius.pact.core:support - au.com.dius.pact.core:pactbroker - au.com.dius.pact.core:model - au.com.dius.pact.core:matcher - au.com.dius.pact.consumer:junit5 - au.com.dius.pact:consumer - org.jboss.byteman:byteman diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java index d650918f6ca4d..97df813e416ef 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java @@ -12,11 +12,11 @@ import java.util.logging.Handler; import java.util.stream.Collectors; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; import org.jboss.logmanager.handlers.AsyncHandler; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/Startup.java b/core/runtime/src/main/java/io/quarkus/runtime/Startup.java index 43750635fffa9..58bf079f15cd7 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/Startup.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/Startup.java @@ -8,13 +8,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.ObserverMethod; /** * This annotation can be used to initialize a CDI bean at application startup: *
    - *
  • If a bean class is annotated then a contextual instance is created and the {@link javax.annotation.PostConstruct} + *
  • If a bean class is annotated then a contextual instance is created and the {@link jakarta.annotation.PostConstruct} * callbacks are invoked.
    • *
  • If a producer method is annotated then a contextual instance is created, i.e. the producer method is invoked.
    • *
  • If a producer field is annotated then a contextual instance is created, i.e. the producer field is read.
    • @@ -68,7 +68,7 @@ /** * * @return the priority - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority */ int value() default ObserverMethod.DEFAULT_PRIORITY; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/annotations/CommandLineArguments.java b/core/runtime/src/main/java/io/quarkus/runtime/annotations/CommandLineArguments.java index 0db283ba1ba1a..4479fdb738e74 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/annotations/CommandLineArguments.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/annotations/CommandLineArguments.java @@ -3,7 +3,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * A qualifier that can be used to inject the command line arguments. diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java index cd1436fca8e32..3d14cb8badb26 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java @@ -5,7 +5,7 @@ import java.io.Serializable; import java.nio.charset.Charset; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java index 2443f5cec5e42..7dfaefabf0118 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CidrAddressConverter.java @@ -4,7 +4,7 @@ import java.io.Serializable; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; import org.wildfly.common.net.CidrAddress; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConverterSupport.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConverterSupport.java index 748e976d4fa3d..a06cc52b0f195 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConverterSupport.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConverterSupport.java @@ -1,6 +1,6 @@ package io.quarkus.runtime.configuration; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java index 0e2c57a83b032..7104f303cd503 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java @@ -7,7 +7,7 @@ import java.time.format.DateTimeParseException; import java.util.regex.Pattern; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java index a1bbbcd1575cf..6ad217740f946 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetAddressConverter.java @@ -6,7 +6,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; import org.wildfly.common.net.Inet; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java index d6dad37ef5e7e..7b761e3bca607 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/InetSocketAddressConverter.java @@ -6,7 +6,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; import org.wildfly.common.net.Inet; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java index cab0ff13948ff..8a5e83a0512bb 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.regex.Pattern; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java index 331be5a4cdb10..8c304ea0bbd1c 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/MemorySizeConverter.java @@ -9,7 +9,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/NormalizeRootHttpPathConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/NormalizeRootHttpPathConverter.java index fcda229d2ec0c..aba452baf545a 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/NormalizeRootHttpPathConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/NormalizeRootHttpPathConverter.java @@ -2,7 +2,7 @@ import static io.quarkus.runtime.configuration.ConverterSupport.DEFAULT_QUARKUS_CONVERTER_PRIORITY; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/PathConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/PathConverter.java index e113a49813308..bcd72cfa304ab 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/PathConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/PathConverter.java @@ -6,7 +6,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/RegexConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/RegexConverter.java index 0f8babbc4b906..518f8d03d0167 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/RegexConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/RegexConverter.java @@ -5,7 +5,7 @@ import java.io.Serializable; import java.util.regex.Pattern; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java index 9303eefb66409..e5d4e582edbb1 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java @@ -5,7 +5,7 @@ import java.io.Serializable; import java.time.ZoneId; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java index 153b810a169e4..73cbb3548d656 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.logging.Level; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; import org.jboss.logmanager.LogContext; diff --git a/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java b/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java index 4c8bd098cb8d9..fe93bb6e43a1a 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.concurrent.Callable; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.cli.common.HelpOption; import io.quarkus.cli.common.OutputOptionMixin; diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml index d6235e0ade1fd..839b86bce4462 100644 --- a/devtools/maven/pom.xml +++ b/devtools/maven/pom.xml @@ -82,8 +82,8 @@ - org.glassfish - jakarta.json + org.eclipse.parsson + parsson diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/Function.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/Function.java index a3810190447fa..123660490b324 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/Function.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/Function.java @@ -9,7 +9,7 @@ import com.microsoft.azure.functions.annotation.FunctionName; import com.microsoft.azure.functions.annotation.HttpTrigger; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; /** diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/GreetingService.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/GreetingService.java index 8a7d5a383e7a5..1cf08dac71ad4 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/GreetingService.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/main/java/org/acme/GreetingService.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/test/java/org/acme/FunctionTest.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/test/java/org/acme/FunctionTest.java index cc484aca49cd6..b699e5643d4eb 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/test/java/org/acme/FunctionTest.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-example/java/src/test/java/org/acme/FunctionTest.java @@ -9,7 +9,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/java/src/main/java/org/acme/GreetingResource.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/java/src/main/java/org/acme/GreetingResource.java index aa65b237e2b1e..8a8e4c50de273 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/java/src/main/java/org/acme/GreetingResource.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/azure-functions-http-example/java/src/main/java/org/acme/GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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 GreetingResource { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java index acb7919dff865..beaa9691770af 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java @@ -1,6 +1,6 @@ package org.acme.funqygooglecloudfunctions; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.cloudevents.CloudEvent; import io.quarkus.funqy.Funq; diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java index 61ee2f8b2e4af..2553264dba9f3 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java @@ -1,6 +1,6 @@ package org.acme.funqygooglecloudfunctions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java index 5ab97f59ce029..b2e16453a00a1 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java @@ -1,6 +1,6 @@ package org.acme.googlecloudfunctions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.cloud.functions.BackgroundFunction; import com.google.cloud.functions.Context; @@ -16,4 +16,4 @@ public void accept(StorageEvent event, Context context) throws Exception { public static class StorageEvent { public String name; } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldCloudEventsFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldCloudEventsFunction.java index 2664514d3d5f4..db4fb8d4bbba8 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldCloudEventsFunction.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldCloudEventsFunction.java @@ -1,6 +1,6 @@ package org.acme.googlecloudfunctions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.cloud.functions.CloudEventsFunction; @@ -16,4 +16,4 @@ public void accept(CloudEvent cloudEvent) throws Exception { System.out.println("Receive event Type: " + cloudEvent.getType()); System.out.println("Receive event Data: " + new String(cloudEvent.getData().toBytes())); } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java index d1ada420e428d..b908e7aeef51d 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java @@ -2,7 +2,7 @@ import java.io.Writer; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.cloud.functions.HttpFunction; import com.google.cloud.functions.HttpRequest; @@ -16,4 +16,4 @@ public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws E Writer writer = httpResponse.getWriter(); writer.write("Hello World"); } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java index 8c58b0385fd55..43d9e4ee26e1a 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java @@ -1,11 +1,11 @@ package org.acme.googlecloudfunctionshttp; -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; @Path("/hello") public class GreetingResource { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java index 31f9254c4a44f..a4ca3339ebe20 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/java/src/main/java/org/acme/MyEntity.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/java/src/main/java/org/acme/MyEntity.tpl.qute.java index 51b4a1aae3679..de8acf86b6ad4 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/java/src/main/java/org/acme/MyEntity.tpl.qute.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/java/src/main/java/org/acme/MyEntity.tpl.qute.java @@ -1,9 +1,9 @@ package org.acme; {#if !input.selected-extensions-ga.contains('io.quarkus:quarkus-hibernate-orm-panache')} -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Example JPA entity. @@ -33,7 +33,7 @@ public class MyEntity { } {#else} import io.quarkus.hibernate.orm.panache.PanacheEntity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** @@ -59,4 +59,4 @@ public class MyEntity { public class MyEntity extends PanacheEntity { public String field; } -{/if} \ No newline at end of file +{/if} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.tpl.qute.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.tpl.qute.kt index 3d8a51d8c6513..c5710b502a12d 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.tpl.qute.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/hibernate-orm-codestart/kotlin/src/main/kotlin/org/acme/MyKotlinEntity.tpl.qute.kt @@ -1,9 +1,9 @@ package org.acme {#if !input.selected-extensions-ga.contains('io.quarkus:quarkus-hibernate-orm-panache-kotlin')} -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id /** * Example JPA entity. @@ -33,7 +33,7 @@ class MyKotlinEntity { {#else} import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion -import javax.persistence.Entity +import jakarta.persistence.Entity /** * Example JPA entity defined as a Kotlin Panache Entity. diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java index 877435b0e4348..8e05b96dd60b6 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/main/java/org/acme/MyReactiveMessagingApplication.java @@ -3,9 +3,9 @@ import io.quarkus.runtime.StartupEvent; import org.eclipse.microprofile.reactive.messaging.*; -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 java.util.stream.Stream; @ApplicationScoped diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java index 7f701585b80cc..33bef2283995d 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-messaging-codestart/java/src/test/java/org/acme/MyReactiveMessagingApplicationTest.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.reactive.messaging.Message; import org.junit.jupiter.api.Test; -import javax.inject.Inject; +import jakarta.inject.Inject; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,4 +22,4 @@ void test() { assertEquals("HELLO", application.toUpperCase(Message.of("Hello")).getPayload()); assertEquals("BONJOUR", application.toUpperCase(Message.of("bonjour")).getPayload()); } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/java/src/main/java/org/acme/MyDeclarativeRoutes.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/java/src/main/java/org/acme/MyDeclarativeRoutes.java index d96fbdae31e3a..4dacbdba6a7f2 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/java/src/main/java/org/acme/MyDeclarativeRoutes.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/java/src/main/java/org/acme/MyDeclarativeRoutes.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RoutingExchange; @@ -13,4 +13,4 @@ public class MyDeclarativeRoutes { void helloRoute(RoutingExchange ex) { ex.ok("Hello " + ex.getParam("name").orElse("Reactive Route") +" !!"); } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/kotlin/src/main/kotlin/org/acme/MyDeclarativeRoutes.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/kotlin/src/main/kotlin/org/acme/MyDeclarativeRoutes.kt index 2aa5124825301..6ae56f183b59f 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/kotlin/src/main/kotlin/org/acme/MyDeclarativeRoutes.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/reactive-routes-codestart/kotlin/src/main/kotlin/org/acme/MyDeclarativeRoutes.kt @@ -3,7 +3,7 @@ package org.acme import io.quarkus.vertx.web.Route import io.quarkus.vertx.web.RoutingExchange import io.vertx.ext.web.RoutingContext -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class MyDeclarativeRoutes { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/java/src/main/java/org/acme/MyRemoteService.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/java/src/main/java/org/acme/MyRemoteService.java index f5b4974a40ffd..b2016fea392dc 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/java/src/main/java/org/acme/MyRemoteService.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/java/src/main/java/org/acme/MyRemoteService.java @@ -2,9 +2,9 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.List; import java.util.Set; diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/kotlin/src/main/kotlin/org/acme/MyRemoteService.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/kotlin/src/main/kotlin/org/acme/MyRemoteService.kt index 0e599b132b33a..e28a0ae228c7d 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/kotlin/src/main/kotlin/org/acme/MyRemoteService.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/rest-client-codestart/kotlin/src/main/kotlin/org/acme/MyRemoteService.kt @@ -1,9 +1,9 @@ package org.acme import org.eclipse.microprofile.rest.client.inject.RegisterRestClient -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.QueryParam +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.QueryParam /** * To use it via injection. diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java index 769ac7eccf80a..720033d91c9f2 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java @@ -1,9 +1,9 @@ package org.acme; -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("{resource.path}") public class {resource.class-name} { @@ -13,4 +13,4 @@ public class {resource.class-name} { public String hello() { return "{resource.response}"; } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt index 6cf3f82e70791..c406ce55ca1f1 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt @@ -1,9 +1,9 @@ package org.acme -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("{resource.path}") class {resource.class-name} { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala index 9c1d477333e38..dc1b6cda15acb 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.\{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.\{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("{resource.path}") class {resource.class-name} { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/java/src/main/java/org/acme/SomePage.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/java/src/main/java/org/acme/SomePage.java index 7c1c0836c930d..7db20ce74c75f 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/java/src/main/java/org/acme/SomePage.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/java/src/main/java/org/acme/SomePage.java @@ -2,11 +2,11 @@ import io.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; -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 static java.util.Objects.requireNonNull; diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt index 85e4f4038d5e3..6a3d408e02803 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt @@ -2,11 +2,11 @@ package org.acme import io.quarkus.qute.Template import io.quarkus.qute.TemplateInstance -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 @Path("/some-page") class SomePage(val page: Template) { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java index 769ac7eccf80a..720033d91c9f2 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java @@ -1,9 +1,9 @@ package org.acme; -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("{resource.path}") public class {resource.class-name} { @@ -13,4 +13,4 @@ public class {resource.class-name} { public String hello() { return "{resource.response}"; } -} \ No newline at end of file +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt index 6cf3f82e70791..c406ce55ca1f1 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt @@ -1,9 +1,9 @@ package org.acme -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("{resource.path}") class {resource.class-name} { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala index 9c1d477333e38..dc1b6cda15acb 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.\{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.\{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("{resource.path}") class {resource.class-name} { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/java/src/main/java/org/acme/SomePage.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/java/src/main/java/org/acme/SomePage.java index 19ba2a00cc774..a35714966e2aa 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/java/src/main/java/org/acme/SomePage.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/java/src/main/java/org/acme/SomePage.java @@ -3,11 +3,11 @@ import io.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; -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 static java.util.Objects.requireNonNull; diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt index 2106a2ccd5f02..6ba6d7b76f5b4 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-qute-codestart/kotlin/src/main/kotlin/org/acme/SomePage.kt @@ -2,11 +2,11 @@ package org.acme import io.quarkus.qute.Template import io.quarkus.qute.TemplateInstance -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 @Path("/some-page") class SomePage(val page: Template) { diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/java/src/main/java/org/acme/StartWebSocket.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/java/src/main/java/org/acme/StartWebSocket.java index 7676e7bfcd644..dfe07814b74d2 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/java/src/main/java/org/acme/StartWebSocket.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/java/src/main/java/org/acme/StartWebSocket.java @@ -1,14 +1,14 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.EncodeException; -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.EncodeException; +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 java.io.IOException; import static java.util.Objects.requireNonNull; diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/kotlin/src/main/kotlin/org/acme/StartWebSocket.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/kotlin/src/main/kotlin/org/acme/StartWebSocket.kt index eadc327cb78ce..aac9a7c067f45 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/kotlin/src/main/kotlin/org/acme/StartWebSocket.kt +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/websockets-codestart/kotlin/src/main/kotlin/org/acme/StartWebSocket.kt @@ -1,9 +1,9 @@ package org.acme -import javax.enterprise.context.ApplicationScoped -import javax.websocket.* -import javax.websocket.server.PathParam -import javax.websocket.server.ServerEndpoint +import jakarta.enterprise.context.ApplicationScoped +import jakarta.websocket.* +import jakarta.websocket.server.PathParam +import jakarta.websocket.server.ServerEndpoint @ApplicationScoped @ServerEndpoint("/start-websocket/{name}") diff --git a/docs/src/main/asciidoc/_examples/acme-serve-http-requests-MyAcmeApplication.java b/docs/src/main/asciidoc/_examples/acme-serve-http-requests-MyAcmeApplication.java index a841dd2b83bf5..cec53c4ce78b4 100644 --- a/docs/src/main/asciidoc/_examples/acme-serve-http-requests-MyAcmeApplication.java +++ b/docs/src/main/asciidoc/_examples/acme-serve-http-requests-MyAcmeApplication.java @@ -1,7 +1,7 @@ // tag::application[] package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.corp.Anvil; import org.acme.corp.Toaster; @@ -23,4 +23,4 @@ public Multi longGoodbye(String name) { } // end::goodbye[] } -// end::application[] \ No newline at end of file +// end::application[] diff --git a/docs/src/main/asciidoc/amazon-lambda-http.adoc b/docs/src/main/asciidoc/amazon-lambda-http.adoc index 846c3b90f4e1f..e822762e31895 100644 --- a/docs/src/main/asciidoc/amazon-lambda-http.adoc +++ b/docs/src/main/asciidoc/amazon-lambda-http.adoc @@ -295,7 +295,7 @@ For the AWS HTTP API you can inject the AWS variables `com.amazonaws.services.la [source, java] ---- -import javax.ws.rs.core.Context; +import jakarta.ws.rs.core.Context; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; @@ -319,7 +319,7 @@ For the AWS REST API you can inject the AWS variables `com.amazonaws.services.la [source, java] ---- -import javax.ws.rs.core.Context; +import jakarta.ws.rs.core.Context; import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext; import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; @@ -353,7 +353,7 @@ request that can be consumed by any HTTP framework Quarkus supports (JAX-RS, ser API Gateway supports many ways to securely invoke on your HTTP endpoints that are backed by Lambda and Quarkus. If you enable it, Quarkus will automatically parse relevant parts of the https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html[event json document] and look for security based metadata and register a `java.security.Principal` internally that can be looked up in JAX-RS -by injecting a `javax.ws.rs.core.SecurityContext`, via `HttpServletRequest.getUserPrincipal()` in servlet, and `RouteContext.user()` in Reactive Routes. +by injecting a `jakarta.ws.rs.core.SecurityContext`, via `HttpServletRequest.getUserPrincipal()` in servlet, and `RouteContext.user()` in Reactive Routes. If you want more security information, the `Principal` object can be typecast to a class that will give you more information. @@ -504,7 +504,7 @@ package org.acme; import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; @@ -535,7 +535,7 @@ package org.acme; import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; @@ -569,4 +569,4 @@ the `QUARKUS_AWS_LAMBDA_FORCE_USER_NAME` environment variable == SnapStart -To optimize your application for Lambda SnapStart, check xref:amazon-snapstart.adoc[the SnapStart Configuration Documentation]. \ No newline at end of file +To optimize your application for Lambda SnapStart, check xref:amazon-snapstart.adoc[the SnapStart Configuration Documentation]. diff --git a/docs/src/main/asciidoc/amazon-snapstart.adoc b/docs/src/main/asciidoc/amazon-snapstart.adoc index 89358253766f3..2b4d8a10efeab 100644 --- a/docs/src/main/asciidoc/amazon-snapstart.adoc +++ b/docs/src/main/asciidoc/amazon-snapstart.adoc @@ -153,9 +153,9 @@ import org.crac.Core; import org.crac.Resource; import org.jboss.logging.Logger; -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; @Startup @ApplicationScoped @@ -191,4 +191,4 @@ WARNING: Restoration is limited to 2 seconds. It is also recommended to use _tiered compilation_ when using SnapStart. To achieve this, set the `JAVA_TOOL_OPTIONS` environment property to `-XX:+TieredCompilation -XX:TieredStopAtLevel=1`. -TIP: `TieredCompilation` can also be interesting for regular Lambda functions. \ No newline at end of file +TIP: `TieredCompilation` can also be interesting for regular Lambda functions. diff --git a/docs/src/main/asciidoc/amqp-reference.adoc b/docs/src/main/asciidoc/amqp-reference.adoc index f8a0df7f4f77b..0b870346c580d 100644 --- a/docs/src/main/asciidoc/amqp-reference.adoc +++ b/docs/src/main/asciidoc/amqp-reference.adoc @@ -102,7 +102,7 @@ package inbound; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class AmqpPriceConsumer { @@ -124,7 +124,7 @@ package inbound; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.concurrent.CompletionStage; @ApplicationScoped @@ -381,8 +381,8 @@ For example, The following code illustrates how you can store incoming payloads import io.smallrye.reactive.messaging.annotations.Blocking; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; @ApplicationScoped public class PriceStorage { diff --git a/docs/src/main/asciidoc/amqp.adoc b/docs/src/main/asciidoc/amqp.adoc index 99cce7e9d1bdb..92161fd78181a 100644 --- a/docs/src/main/asciidoc/amqp.adoc +++ b/docs/src/main/asciidoc/amqp.adoc @@ -164,11 +164,11 @@ package org.acme.amqp.producer; import java.util.UUID; -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.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.acme.amqp.model.Quote; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -214,7 +214,7 @@ package org.acme.amqp.processor; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.amqp.model.Quote; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/docs/src/main/asciidoc/azure-functions.adoc b/docs/src/main/asciidoc/azure-functions.adoc index 2b8dcf1128122..31115ad7298d9 100644 --- a/docs/src/main/asciidoc/azure-functions.adoc +++ b/docs/src/main/asciidoc/azure-functions.adoc @@ -28,7 +28,7 @@ import com.microsoft.azure.functions.annotation.AuthorizationLevel; import com.microsoft.azure.functions.annotation.FunctionName; import com.microsoft.azure.functions.annotation.HttpTrigger; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Optional; public class Function { diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc index 5fe1d64f25caf..c055684287d9b 100644 --- a/docs/src/main/asciidoc/building-my-first-extension.adoc +++ b/docs/src/main/asciidoc/building-my-first-extension.adoc @@ -530,10 +530,10 @@ mkdir -p ./greeting-extension/runtime/src/main/java/org/acme/greeting/extension ---- package org.acme.greeting.extension; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @WebServlet @@ -546,7 +546,7 @@ public class GreetingExtensionServlet extends HttpServlet { // <1> } ---- -<1> As usual, defining a servlet requires to extend `javax.servlet.http.HttpServlet`. +<1> As usual, defining a servlet requires to extend `jakarta.servlet.http.HttpServlet`. <2> Since we want to respond to the HTTP GET verb, we override the `doGet` method and write `Hello` in the Servlet response's output stream. === Deploying the Greeting feature diff --git a/docs/src/main/asciidoc/cache.adoc b/docs/src/main/asciidoc/cache.adoc index 524f28c61cb54..6881cf3a3c5ad 100644 --- a/docs/src/main/asciidoc/cache.adoc +++ b/docs/src/main/asciidoc/cache.adoc @@ -78,7 +78,7 @@ package org.acme.cache; import java.time.LocalDate; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class WeatherForecastService { @@ -151,10 +151,10 @@ import java.time.LocalDate; import java.util.Arrays; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.RestQuery; @@ -211,7 +211,7 @@ package org.acme.cache; import java.time.LocalDate; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.cache.CacheResult; @@ -344,7 +344,7 @@ When a cache key is built from several method arguments, whether they are explic ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheResult; @@ -384,7 +384,7 @@ public class CachedService { You may want to include more than the arguments of a method into a cache key. This can be done by implementing the `io.quarkus.cache.CacheKeyGenerator` interface and declaring that implementation in the `keyGenerator` field of a `@CacheResult` or `@CacheInvalidate` annotation. -If a CDI scope is declared on a key generator class and if that class has a default qualifier (no qualifier annotation or `@javax.enterprise.inject.Default`), then the key generator will be injected as a CDI bean during the cache key computation. +If a CDI scope is declared on a key generator class and if that class has a default qualifier (no qualifier annotation or `@jakarta.enterprise.inject.Default`), then the key generator will be injected as a CDI bean during the cache key computation. Otherwise, the key generator will be instantiated using its default constructor. All CDI scopes supported by Quarkus can be used on a key generator. @@ -395,8 +395,8 @@ The following key generator will be injected as a CDI bean: package org.acme.cache; import java.lang.reflect.Method; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.cache.CacheKeyGenerator; import io.quarkus.cache.CompositeCacheKey; @@ -447,7 +447,7 @@ Both kinds of key generators can be used in a similar way: ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.cache.ApplicationScopedKeyGen; import org.acme.cache.NotABeanKeyGen; @@ -496,8 +496,8 @@ The following sections will show you how to do that. ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheName; @@ -539,8 +539,8 @@ Another way to retrieve a `Cache` instance consists in injecting the `io.quarkus ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheManager; @@ -578,7 +578,7 @@ If the cache entries are modified while an iteration over the set is in progress ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheName; @@ -607,7 +607,7 @@ This method associates the `CompletableFuture` with the given key in the cache. ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheName; @@ -639,7 +639,7 @@ Otherwise, the method will return `null`. ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheName; @@ -668,8 +668,8 @@ Similarly, the maximum size of a `CaffeineCache` can be changed in real time if ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheManager; @@ -804,7 +804,7 @@ cache_eviction_weight_total{cache="foo",} 540.0 ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheInvalidateAll; @@ -835,7 +835,7 @@ public class CachedService { ---- package org.acme.cache; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheInvalidateAll; @@ -867,7 +867,7 @@ public class CachedService { ---- package org.acme.cache; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheInvalidateAll; @@ -898,7 +898,7 @@ public class CachedService { ---- package org.acme.cache; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.cache.CacheInvalidate; import io.quarkus.cache.CacheInvalidateAll; @@ -928,8 +928,8 @@ public class CachedService { ---- package org.acme.cache; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.cache.CacheManager; diff --git a/docs/src/main/asciidoc/cdi-integration.adoc b/docs/src/main/asciidoc/cdi-integration.adoc index a055a52f20994..d0519ea168818 100644 --- a/docs/src/main/asciidoc/cdi-integration.adoc +++ b/docs/src/main/asciidoc/cdi-integration.adoc @@ -160,7 +160,7 @@ _Solution_: Use the `AdditionalBeanBuildItem` as described in < Generate the bytecode of the `javax.enterprise.context.spi.Contextual#create(CreationalContext)` implementation. +<1> Generate the bytecode of the `jakarta.enterprise.context.spi.Contextual#create(CreationalContext)` implementation. The output of a bean configurator is recorded as bytecode. Therefore, there are some limitations in how a synthetic bean instance is created at runtime. @@ -451,7 +451,7 @@ _Solution_: You can inject the `CustomScopeAnnotationsBuildItem` in a build step [[additional_interceptor_bindings]] == Use Case - Additional Interceptor Bindings -In rare cases it might be handy to programmatically register an existing annotation that is not annotated with `@javax.interceptor.InterceptorBinding` as an interceptor binding. +In rare cases it might be handy to programmatically register an existing annotation that is not annotated with `@jakarta.interceptor.InterceptorBinding` as an interceptor binding. This is similar to what CDI achieves through `BeforeBeanDiscovery#addInterceptorBinding()`. We are going to use `InterceptorBindingRegistrarBuildItem` to get it done. @@ -471,7 +471,7 @@ InterceptorBindingRegistrarBuildItem addInterceptorBindings() { == Use Case - Additional Qualifiers -Sometimes it might be useful to register an existing annotation that is not annotated with `@javax.inject.Qualifier` as a CDI qualifier. +Sometimes it might be useful to register an existing annotation that is not annotated with `@jakarta.inject.Qualifier` as a CDI qualifier. This is similar to what CDI achieves through `BeforeBeanDiscovery#addQualifier()`. We are going to use `QualifierRegistrarBuildItem` to get it done. @@ -492,7 +492,7 @@ QualifierRegistrarBuildItem addQualifiers() { == Use Case - Additional Stereotypes -It is sometimes useful to register an existing annotation that is not annotated with `@javax.enterprise.inject.Stereotype` as a CDI stereotype. +It is sometimes useful to register an existing annotation that is not annotated with `@jakarta.enterprise.inject.Stereotype` as a CDI stereotype. This is similar to what CDI achieves through `BeforeBeanDiscovery#addStereotype()`. We are going to use `StereotypeRegistrarBuildItem` to get it done. diff --git a/docs/src/main/asciidoc/cdi-reference.adoc b/docs/src/main/asciidoc/cdi-reference.adoc index 8dc41d17e8b4a..3aff6c6727aed 100644 --- a/docs/src/main/asciidoc/cdi-reference.adoc +++ b/docs/src/main/asciidoc/cdi-reference.adoc @@ -212,7 +212,7 @@ public class CounterBean { * Dependency injection and lookup ** Field, constructor and initializer/setter injection ** Type-safe resolution -** Programmatic lookup via `javax.enterprise.inject.Instance` +** Programmatic lookup via `jakarta.enterprise.inject.Instance` ** Client proxies ** Injection point metadata * Scopes and contexts; see xref:cdi.adoc#bean-scope-available[here] for details @@ -455,7 +455,7 @@ An _unused_ bean: * is not _unremovable_, and * is not eligible for injection to any injection point in the dependency tree, and * does not declare any producer which is eligible for injection to any injection point in the dependency tree, and -* is not eligible for injection into any `javax.enterprise.inject.Instance` or `javax.inject.Provider` injection point. +* is not eligible for injection into any `jakarta.enterprise.inject.Instance` or `jakarta.inject.Provider` injection point. Unused interceptors and decorators are not associated with any bean. @@ -655,7 +655,7 @@ NOTE: Properties set at runtime have absolutely no effect on the bean resolution In CDI, an alternative bean may be selected either globally for an application by means of `@Priority`, or for a bean archive using a `beans.xml` descriptor. Quarkus has a simplified bean discovery and the content of `beans.xml` is ignored. -The disadvantage of `@javax.annotation.Priority` is that it has `@Target({ TYPE, PARAMETER })` and so it cannot be used for producer methods and fields. +The disadvantage of `@jakarta.annotation.Priority` is that it has `@Target({ TYPE, PARAMETER })` and so it cannot be used for producer methods and fields. This problem should be fixed in Common Annotations 2.1. Users are encouraged to use `@io.quarkus.arc.Priority` instead, until Quarkus upgrades to this version of `jakarta.annotation-api`. @@ -838,7 +838,7 @@ Other interceptors could be provided to log method invocations to different targ === Caching the Result of Programmatic Lookup -In certain situations, it is practical to obtain a bean instance programmatically via an injected `javax.enterprise.inject.Instance` and `Instance.get()`. +In certain situations, it is practical to obtain a bean instance programmatically via an injected `jakarta.enterprise.inject.Instance` and `Instance.get()`. However, according to the specification the `get()` method must identify the matching bean and obtain a contextual reference. As a consequence, a new instance of a `@Dependent` bean is returned from each invocation of `get()`. Moreover, this instance is a dependent object of the injected `Instance`. @@ -890,11 +890,11 @@ class Consumer { } ---- -TIP: It is also possible to clear the cached value via `io.quarkus.arc.InjectableInstance.clearCache()`. In this case, you'll need to inject the Quarkus-specific `io.quarkus.arc.InjectableInstance` instead of `javax.enterprise.inject.Instance`. +TIP: It is also possible to clear the cached value via `io.quarkus.arc.InjectableInstance.clearCache()`. In this case, you'll need to inject the Quarkus-specific `io.quarkus.arc.InjectableInstance` instead of `jakarta.enterprise.inject.Instance`. === Declaratively Choose Beans That Can Be Obtained by Programmatic Lookup -It is sometimes useful to narrow down the set of beans that can be obtained by programmatic lookup via `javax.enterprise.inject.Instance`. +It is sometimes useful to narrow down the set of beans that can be obtained by programmatic lookup via `jakarta.enterprise.inject.Instance`. Typically, a user needs to choose the appropriate implementation of an interface based on a runtime configuration property. Imagine that we have two beans implementing the interface `org.acme.Service`. @@ -944,7 +944,7 @@ Alternatively, you can use the `@LookupIfProperty` and `@LookupUnlessProperty` a === Injecting Multiple Bean Instances Intuitively -In CDI, it's possible to inject multiple bean instances (aka contextual references) via the `javax.enterprise.inject.Instance` which implements `java.lang.Iterable`. +In CDI, it's possible to inject multiple bean instances (aka contextual references) via the `jakarta.enterprise.inject.Instance` which implements `java.lang.Iterable`. However, it's not exactly intuitive. Therefore, a new way was introduced in Quarkus - you can inject a `java.util.List` annotated with the `io.quarkus.arc.All` qualifier. The type of elements in the list is used as the required type when performing the lookup. @@ -962,7 +962,7 @@ public class Processor { <1> The injected instance is an _immutable list_ of the contextual references of the _disambiguated_ beans. <2> For this injection point the required type is `Service` and no additional qualifiers are declared. -TIP: The list is sorted by priority as defined by `io.quarkus.arc.InjectableBean#getPriority()`. Higher priority goes first. In general, the `@javax.annotation.Priority` and `@io.quarkus.arc.Priority` annotations can be used to assign the priority to a class bean, producer method or producer field. +TIP: The list is sorted by priority as defined by `io.quarkus.arc.InjectableBean#getPriority()`. Higher priority goes first. In general, the `@jakarta.annotation.Priority` and `@io.quarkus.arc.Priority` annotations can be used to assign the priority to a class bean, producer method or producer field. If an injection point declares no other qualifier than `@All` then `@Any` is used, i.e. the behavior is equivalent to `@Inject @Any Instance`. @@ -1042,7 +1042,7 @@ If an exception is thrown by an asynchronous observer then the `CompletionStage` However, if the event producer does not care then the exception is ignored silently. Therefore, Quarkus logs an error message by default. It is also possible to implement a custom `AsyncObserverExceptionHandler`. -A bean that implements this interface should be `@javax.inject.Singleton` or `@javax.enterprise.context.ApplicationScoped`. +A bean that implements this interface should be `@jakarta.inject.Singleton` or `@jakarta.enterprise.context.ApplicationScoped`. .`NoopAsyncObserverExceptionHandler` [source, java] diff --git a/docs/src/main/asciidoc/cdi.adoc b/docs/src/main/asciidoc/cdi.adoc index 5393766a44cb2..fe91fefe70bd6 100644 --- a/docs/src/main/asciidoc/cdi.adoc +++ b/docs/src/main/asciidoc/cdi.adoc @@ -38,8 +38,8 @@ The most common ones are class-based beans: .Simple Bean Example [source,java] ---- -import javax.inject.Inject; -import javax.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.metrics.annotation.Counted; @ApplicationScoped <1> @@ -78,7 +78,7 @@ This is very useful because your application fails fast whenever the container i [TIP] ==== -Your can use programmatic lookup via `javax.enterprise.inject.Instance` to resolve ambiguities at runtime and even iterate over all beans implementing a given type: +Your can use programmatic lookup via `jakarta.enterprise.inject.Instance` to resolve ambiguities at runtime and even iterate over all beans implementing a given type: [source,java] ---- @@ -95,7 +95,7 @@ public class Translator { } ---- <1> This injection point will not result in an ambiguous dependency even if there are multiple beans that implement the `Dictionary` type. -<2> `javax.enterprise.inject.Instance` extends `Iterable`. +<2> `jakarta.enterprise.inject.Instance` extends `Iterable`. ==== == Can I use setter and constructor injection? @@ -135,7 +135,7 @@ https://jakarta.ee/specifications/cdi/2.0/cdi-spec-2.0.html#qualifiers[Qualifier As we already said a bean is assignable to an injection point if it has all the required qualifiers. If you declare no qualifier at an injection point the `@Default` qualifier is assumed. -A qualifier type is a Java annotation defined as `@Retention(RUNTIME)` and annotated with the `@javax.inject.Qualifier` meta-annotation: +A qualifier type is a Java annotation defined as `@Retention(RUNTIME)` and annotated with the `@jakarta.inject.Qualifier` meta-annotation: .Qualifier Example [source,java] @@ -176,20 +176,20 @@ NOTE: Every bean has exactly one scope. [[bean-scope-available]] == [[what-scopes-can-i-actually-use-in-my-quarkus-application]] What scopes can I actually use in my Quarkus application? -You can use all the built-in scopes mentioned by the specification except for `javax.enterprise.context.ConversationScoped`. +You can use all the built-in scopes mentioned by the specification except for `jakarta.enterprise.context.ConversationScoped`. [options="header",cols="1,1"] |=== |Annotation |Description //---------------------- -|`@javax.enterprise.context.ApplicationScoped` | A single bean instance is used for the application and shared among all injection points. The instance is created lazily, i.e. once a method is invoked upon the <>. -|`@javax.inject.Singleton` | Just like `@ApplicationScoped` except that no client proxy is used. The instance is created when an injection point that resolves to a @Singleton bean is being injected. -|`@javax.enterprise.context.RequestScoped` | The bean instance is associated with the current _request_ (usually an HTTP request). -|`@javax.enterprise.context.Dependent` | This is a pseudo-scope. The instances are not shared and every injection point spawns a new instance of the dependent bean. The lifecycle of dependent bean is bound to the bean injecting it - it will be created and destroyed along with the bean injecting it. -|`@javax.enterprise.context.SessionScoped` | This scope is backed by a `javax.servlet.http.HttpSession` object. It's only available if the `quarkus-undertow` extension is used. +|`@jakarta.enterprise.context.ApplicationScoped` | A single bean instance is used for the application and shared among all injection points. The instance is created lazily, i.e. once a method is invoked upon the <>. +|`@jakarta.inject.Singleton` | Just like `@ApplicationScoped` except that no client proxy is used. The instance is created when an injection point that resolves to a @Singleton bean is being injected. +|`@jakarta.enterprise.context.RequestScoped` | The bean instance is associated with the current _request_ (usually an HTTP request). +|`@jakarta.enterprise.context.Dependent` | This is a pseudo-scope. The instances are not shared and every injection point spawns a new instance of the dependent bean. The lifecycle of dependent bean is bound to the bean injecting it - it will be created and destroyed along with the bean injecting it. +|`@jakarta.enterprise.context.SessionScoped` | This scope is backed by a `jakarta.servlet.http.HttpSession` object. It's only available if the `quarkus-undertow` extension is used. |=== -NOTE: There can be other custom scopes provided by Quarkus extensions. For example, xref:transaction.adoc[`quarkus-narayana-jta`] provides xref:transaction.adoc#transaction-scope[`javax.transaction.TransactionScoped`]. +NOTE: There can be other custom scopes provided by Quarkus extensions. For example, xref:transaction.adoc[`quarkus-narayana-jta`] provides xref:transaction.adoc#transaction-scope[`jakarta.transaction.TransactionScoped`]. == `@ApplicationScoped` and `@Singleton` look very similar. Which one should I choose for my Quarkus application? @@ -320,8 +320,8 @@ A bean class may declare lifecycle `@PostConstruct` and `@PreDestroy` callbacks: .Lifecycle Callbacks Example [source,java] ---- -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; @ApplicationScoped public class Translator { @@ -356,7 +356,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding // <1> @Retention(RetentionPolicy.RUNTIME) @@ -372,10 +372,10 @@ public @interface Logged { .Simple Interceptor Example [source,java] ---- -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Logged // <1> @Priority(2020) // <2> @@ -407,7 +407,7 @@ NOTE: Instances of interceptors are dependent objects of the bean instance they .Simple Example of Interceptor Usage [source,java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Logged // <1> <2> @ApplicationScoped @@ -430,11 +430,11 @@ Decorators are similar to interceptors, but because they implement interfaces wi .Simple Decorator Example [source,java] ---- -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.enterprise.inject.Any; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.enterprise.inject.Any; public interface Account { void withdraw(BigDecimal amount); @@ -506,7 +506,7 @@ class Logger { } ---- -<1> `javax.enterprise.event.Event` is used to fire events. +<1> `jakarta.enterprise.event.Event` is used to fire events. <2> Fire the event synchronously. <3> This method is notified when a `TaskCompleted` event is fired. diff --git a/docs/src/main/asciidoc/centralized-log-management.adoc b/docs/src/main/asciidoc/centralized-log-management.adoc index d274aa94355fd..6ee23b3d85598 100644 --- a/docs/src/main/asciidoc/centralized-log-management.adoc +++ b/docs/src/main/asciidoc/centralized-log-management.adoc @@ -59,9 +59,9 @@ For demonstration purposes, we create an endpoint that does nothing but log a se [source,java] ---- -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.logging.Logger; diff --git a/docs/src/main/asciidoc/command-mode-reference.adoc b/docs/src/main/asciidoc/command-mode-reference.adoc index 73f2cbd46a499..7633b1164438a 100644 --- a/docs/src/main/asciidoc/command-mode-reference.adoc +++ b/docs/src/main/asciidoc/command-mode-reference.adoc @@ -244,8 +244,8 @@ package org.acme.commandmode.test; import java.util.Set; -import javax.enterprise.inject.Alternative; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.acme.commandmode.test.MyCommandModeTest.MyTestProfile; diff --git a/docs/src/main/asciidoc/config-extending-support.adoc b/docs/src/main/asciidoc/config-extending-support.adoc index fa4c16f5c7dc2..ae4f9035d3586 100644 --- a/docs/src/main/asciidoc/config-extending-support.adoc +++ b/docs/src/main/asciidoc/config-extending-support.adoc @@ -298,7 +298,7 @@ MicroProfileCustomValue value; === Converter priority -The `javax.annotation.Priority` annotation overrides the `Converter` priority and change converters precedence to fine +The `jakarta.annotation.Priority` annotation overrides the `Converter` priority and change converters precedence to fine tune the execution order. By default, if no `@Priority` is specified by the `Converter`, the converter is registered with a priority of `100`. Consider: @@ -306,7 +306,7 @@ with a priority of `100`. Consider: ---- package org.acme.config; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; @Priority(150) @@ -368,7 +368,7 @@ The `ConfigSourceInterceptorFactory` may initialize an interceptor with access t ---- package org.acme.config; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import io.smallrye.config.ConfigSourceInterceptor; import io.smallrye.config.ConfigLogging; diff --git a/docs/src/main/asciidoc/config-reference.adoc b/docs/src/main/asciidoc/config-reference.adoc index caf27a09f1490..5d5d84deeabc7 100644 --- a/docs/src/main/asciidoc/config-reference.adoc +++ b/docs/src/main/asciidoc/config-reference.adoc @@ -187,7 +187,7 @@ String suffix; @ConfigProperty(name = "greeting.name") Optional name; <3> ---- -<1> If you do not provide a value for this property, the application startup fails with `javax.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`. +<1> If you do not provide a value for this property, the application startup fails with `jakarta.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`. <2> The default value is injected if the configuration does not provide a value for `greeting.suffix`. <3> This property is optional - an empty `Optional` is injected if the configuration does not provide a value for `greeting.name`. @@ -196,7 +196,7 @@ TIP: Use xref:config-mappings.adoc#config-mappings[Config Mappings] to group sim === Default Values If a property is associated with a default value (by way of the `defaultValue` attribute), and no configuration value -is supplied for the property, then rather than throwing a `javax.enterprise.inject.spi.DeploymentException`, the +is supplied for the property, then rather than throwing a `jakarta.enterprise.inject.spi.DeploymentException`, the default value will be used. The `defaultValue` value is expressed as a `String`, and uses the same conversion mechanism used to process configuration values. Several Built-in Converters already exist for primitives, boxed primitives, and other classes; for example: diff --git a/docs/src/main/asciidoc/config.adoc b/docs/src/main/asciidoc/config.adoc index 28ce6b254b2e8..8c85387db49cc 100644 --- a/docs/src/main/asciidoc/config.adoc +++ b/docs/src/main/asciidoc/config.adoc @@ -68,10 +68,10 @@ Create the `org.acme.config.GreetingResource` REST resource with the following c ---- package org.acme.config; -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 { @@ -112,7 +112,7 @@ String suffix; @ConfigProperty(name = "greeting.name") Optional name; <3> ---- -<1> If you do not provide a value for this property, the application startup fails with `javax.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`. +<1> If you do not provide a value for this property, the application startup fails with `jakarta.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`. <2> The default value is injected if the configuration does not provide a value for `greeting.suffix`. <3> This property is optional - an empty `Optional` is injected if the configuration does not provide a value for `greeting.name`. diff --git a/docs/src/main/asciidoc/doc-create-tutorial.adoc b/docs/src/main/asciidoc/doc-create-tutorial.adoc index 2fdfe4f9522a9..237328c5f1fd4 100644 --- a/docs/src/main/asciidoc/doc-create-tutorial.adoc +++ b/docs/src/main/asciidoc/doc-create-tutorial.adoc @@ -180,7 +180,7 @@ Let's add the following code to that file: // tag::application[] package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.corp.Anvil; import org.acme.corp.Toaster; diff --git a/docs/src/main/asciidoc/elasticsearch.adoc b/docs/src/main/asciidoc/elasticsearch.adoc index 45c9f8a840644..40c57463d07ee 100644 --- a/docs/src/main/asciidoc/elasticsearch.adoc +++ b/docs/src/main/asciidoc/elasticsearch.adoc @@ -113,8 +113,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.http.util.EntityUtils; import org.elasticsearch.client.Request; @@ -194,10 +194,10 @@ Now, create the `org.acme.elasticsearch.FruitResource` class as follows: ---- package org.acme.elasticsearch; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import java.io.IOException; import java.net.URI; import java.util.List; @@ -290,7 +290,7 @@ import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.SSLContexts; import org.elasticsearch.client.RestClientBuilder; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import javax.net.ssl.SSLContext; import java.io.InputStream; import java.nio.file.Files; @@ -399,8 +399,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; diff --git a/docs/src/main/asciidoc/funqy-gcp-functions.adoc b/docs/src/main/asciidoc/funqy-gcp-functions.adoc index 8ce831a04917c..be764d8c59bbf 100644 --- a/docs/src/main/asciidoc/funqy-gcp-functions.adoc +++ b/docs/src/main/asciidoc/funqy-gcp-functions.adoc @@ -83,7 +83,7 @@ NOTE: Quarkus supports Cloud Functions gen 1 and gen 2. For an overview of Cloud [source,java] ---- -import javax.inject.Inject; +import jakarta.inject.Inject; import io.cloudevents.CloudEvent; import io.quarkus.funqy.Funq; diff --git a/docs/src/main/asciidoc/funqy.adoc b/docs/src/main/asciidoc/funqy.adoc index 4e7403c59abd2..5ad901bad9639 100644 --- a/docs/src/main/asciidoc/funqy.adoc +++ b/docs/src/main/asciidoc/funqy.adoc @@ -118,8 +118,8 @@ The default object lifecycle for a Funqy class is `@Dependent`. ---- import io.quarkus.funqy.Funq; -import javax.inject.Inject; -import javax.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingFunction { diff --git a/docs/src/main/asciidoc/gcp-functions-http.adoc b/docs/src/main/asciidoc/gcp-functions-http.adoc index 3e08fa4086779..54bae65285fae 100644 --- a/docs/src/main/asciidoc/gcp-functions-http.adoc +++ b/docs/src/main/asciidoc/gcp-functions-http.adoc @@ -72,10 +72,10 @@ NOTE: Quarkus supports Cloud Functions gen 1 and gen 2. For an overview of Cloud [source,java] ---- -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 GreetingResource { @@ -94,11 +94,11 @@ public class GreetingResource { ---- import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/docs/src/main/asciidoc/gcp-functions.adoc b/docs/src/main/asciidoc/gcp-functions.adoc index 54e6de864825b..53f7a0474af41 100644 --- a/docs/src/main/asciidoc/gcp-functions.adoc +++ b/docs/src/main/asciidoc/gcp-functions.adoc @@ -94,9 +94,9 @@ public class TestHttpFunction implements HttpFunction { [source,java] ---- import java.io.Writer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.HttpFunction; import com.google.cloud.functions.HttpRequest; import com.google.cloud.functions.HttpResponse; @@ -126,9 +126,9 @@ This `BackgroundFunction` is triggered by a Storage event, you can use any event [source,java] ---- -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.BackgroundFunction; import com.google.cloud.functions.Context; import io.quarkus.gcp.function.test.service.GreetingService; @@ -164,9 +164,9 @@ This `RawBackgroundFunction` is triggered by a PubSub event, you can use any eve [source,java] ---- -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.Context; import com.google.cloud.functions.RawBackgroundFunction; import io.quarkus.gcp.function.test.service.GreetingService; @@ -197,9 +197,9 @@ This `CloudEventsFunction` is triggered by a Cloud Events Storage event, you can [source,java] ---- -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.CloudEventsFunction; diff --git a/docs/src/main/asciidoc/getting-started-reactive.adoc b/docs/src/main/asciidoc/getting-started-reactive.adoc index fead1e41e8c1f..e94727b4274c1 100644 --- a/docs/src/main/asciidoc/getting-started-reactive.adoc +++ b/docs/src/main/asciidoc/getting-started-reactive.adoc @@ -121,9 +121,9 @@ Let's start with the `Fruit` entity.Create the `src/main/java/org/acme/hibernate ---- package org.acme.hibernate.orm.panache; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; // <1> @@ -182,8 +182,8 @@ Create the `src/main/java/org/acme/hibernate/orm/panache/FruitResource.java` fil ---- package org.acme.hibernate.orm.panache; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Path; @Path("/fruits") @ApplicationScoped diff --git a/docs/src/main/asciidoc/getting-started-testing.adoc b/docs/src/main/asciidoc/getting-started-testing.adoc index 8027f88fa1835..43bbc5c87accd 100644 --- a/docs/src/main/asciidoc/getting-started-testing.adoc +++ b/docs/src/main/asciidoc/getting-started-testing.adoc @@ -346,7 +346,7 @@ service directly without using HTTP: ---- package org.acme.getting.started.testing; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/docs/src/main/asciidoc/getting-started.adoc b/docs/src/main/asciidoc/getting-started.adoc index aaac5a62fc529..bac34c02fe8fd 100644 --- a/docs/src/main/asciidoc/getting-started.adoc +++ b/docs/src/main/asciidoc/getting-started.adoc @@ -152,10 +152,10 @@ During the project creation, the `src/main/java/org/acme/GreetingResource.java` ---- package org.acme; -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 GreetingResource { @@ -237,7 +237,7 @@ Create the `src/main/java/org/acme/GreetingService.java` file with the following ---- package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { @@ -255,11 +255,11 @@ Edit the `GreetingResource` class to inject the `GreetingService` and create a n ---- package org.acme; -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("/hello") public class GreetingResource { diff --git a/docs/src/main/asciidoc/grpc-getting-started.adoc b/docs/src/main/asciidoc/grpc-getting-started.adoc index 1b4871783bf6b..6ca7f25c88e38 100644 --- a/docs/src/main/asciidoc/grpc-getting-started.adoc +++ b/docs/src/main/asciidoc/grpc-getting-started.adoc @@ -290,10 +290,10 @@ import io.quarkus.example.HelloRequest; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; -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 ExampleResource { diff --git a/docs/src/main/asciidoc/grpc-service-consumption.adoc b/docs/src/main/asciidoc/grpc-service-consumption.adoc index 363d8dae5a4ca..c5ab94b411a5c 100644 --- a/docs/src/main/asciidoc/grpc-service-consumption.adoc +++ b/docs/src/main/asciidoc/grpc-service-consumption.adoc @@ -78,10 +78,10 @@ import io.smallrye.mutiny.Uni; import hello.Greeter; -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 ExampleResource { @@ -107,10 +107,10 @@ import io.quarkus.grpc.GrpcClient; import hello.GreeterGrpc.GreeterBlockingStub; -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 ExampleResource { @@ -154,11 +154,11 @@ import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; -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("/streaming") @Produces(MediaType.APPLICATION_JSON) @@ -266,7 +266,7 @@ Headers can be useful e.g. for authentication. To set headers for a gRPC call, create a client with headers attached and then perform the call on this client: [source,java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import examples.Greeter; import examples.HelloReply; @@ -345,7 +345,7 @@ class MyBean { ---- <1> Registers the `MySpecialInterceptor` for this particular client. -When you have multiple client interceptors, you can order them by implementing the `javax.enterprise.inject.spi.Prioritized` interface: +When you have multiple client interceptors, you can order them by implementing the `jakarta.enterprise.inject.spi.Prioritized` interface: [source, java] ---- diff --git a/docs/src/main/asciidoc/grpc-service-implementation.adoc b/docs/src/main/asciidoc/grpc-service-implementation.adoc index 626d245c33a95..272647040240b 100644 --- a/docs/src/main/asciidoc/grpc-service-implementation.adoc +++ b/docs/src/main/asciidoc/grpc-service-implementation.adoc @@ -62,7 +62,7 @@ public class HelloService implements Greeter { <2> } } ---- -<1> A gRPC service implementation bean must be annotated with the `@GrpcService` annotation and should not declare any other CDI qualifier. All gRPC services have the `javax.inject.Singleton` scope. Additionally, the request context is always active during a service call. +<1> A gRPC service implementation bean must be annotated with the `@GrpcService` annotation and should not declare any other CDI qualifier. All gRPC services have the `jakarta.inject.Singleton` scope. Additionally, the request context is always active during a service call. <2> `hello.Greeter` is the generated service interface. NOTE: The service implementation bean can also extend the Mutiny implementation base, where the class name is structured as follows: `Mutiny${NAME_OF_THE_SERVICE}Grpc.${NAME_OF_THE_SERVICE}ImplBase`. @@ -284,7 +284,7 @@ public class StreamingService implements Streaming { } ---- -When you have multiple server interceptors, you can order them by implementing the `javax.enterprise.inject.spi.Prioritized` interface. Please note that all the global interceptors are invoked before the service-specific +When you have multiple server interceptors, you can order them by implementing the `jakarta.enterprise.inject.spi.Prioritized` interface. Please note that all the global interceptors are invoked before the service-specific interceptors. [source, java] diff --git a/docs/src/main/asciidoc/hibernate-orm.adoc b/docs/src/main/asciidoc/hibernate-orm.adoc index 5017dd72d4e5b..44bade252a708 100644 --- a/docs/src/main/asciidoc/hibernate-orm.adoc +++ b/docs/src/main/asciidoc/hibernate-orm.adoc @@ -426,9 +426,9 @@ difference is that you would specify your Hibernate ORM configuration in `META-I Optimistically create the tables; will cause background errors being logged if they already exist, but is practical to retain existing data across runs (or create as needed) --> - + - + @@ -583,7 +583,7 @@ Applications that frequently read the same entities can see their performance im === Caching of entities -To enable second-level cache, mark the entities that you want cached with `@javax.persistence.Cacheable`: +To enable second-level cache, mark the entities that you want cached with `@jakarta.persistence.Cacheable`: [source,java] ---- @@ -839,11 +839,11 @@ Let's start by implementing the `/{tenant}` endpoint. As you can see from the so [source,java] ---- -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @ApplicationScoped @Path("/{tenant}") @@ -866,7 +866,7 @@ In order to resolve the tenant from incoming requests and map it to a specific t [source,java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver; import io.vertx.ext.web.RoutingContext; diff --git a/docs/src/main/asciidoc/hibernate-reactive.adoc b/docs/src/main/asciidoc/hibernate-reactive.adoc index 890e27eb0831d..8a64046d61581 100644 --- a/docs/src/main/asciidoc/hibernate-reactive.adoc +++ b/docs/src/main/asciidoc/hibernate-reactive.adoc @@ -265,7 +265,7 @@ Here's a list of things to pay attention when using Hibernate Reactive in Quarku * it's not possible to configure multiple persistence units at the moment * it's not configurable via a `persistence.xml` file * integration with the Envers extension is not supported -* transaction demarcation cannot be done using `javax.transaction.Transactional` +* transaction demarcation cannot be done using `jakarta.transaction.Transactional` == Simplifying Hibernate Reactive with Panache diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc index 0b1406948fadb..1cd5b605ccd46 100644 --- a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc +++ b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc @@ -89,10 +89,10 @@ package org.acme.hibernate.search.elasticsearch.model; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import io.quarkus.hibernate.orm.panache.PanacheEntity; @@ -136,8 +136,8 @@ package org.acme.hibernate.search.elasticsearch.model; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -187,15 +187,15 @@ package org.acme.hibernate.search.elasticsearch; import java.util.List; import java.util.Optional; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -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.core.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +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.core.MediaType; import org.acme.hibernate.search.elasticsearch.model.Author; import org.acme.hibernate.search.elasticsearch.model.Book; @@ -293,8 +293,8 @@ package org.acme.hibernate.search.elasticsearch.model; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; @@ -336,10 +336,10 @@ package org.acme.hibernate.search.elasticsearch.model; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; import org.hibernate.search.engine.backend.types.Sortable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; @@ -439,8 +439,8 @@ package org.acme.hibernate.search.elasticsearch.config; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; -import javax.enterprise.context.Dependent; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Named; @SearchExtension // <1> public class AnalysisConfigurer implements ElasticsearchAnalysisConfigurer { diff --git a/docs/src/main/asciidoc/http-reference.adoc b/docs/src/main/asciidoc/http-reference.adoc index 0572dc61dea26..cc1fed445383b 100644 --- a/docs/src/main/asciidoc/http-reference.adoc +++ b/docs/src/main/asciidoc/http-reference.adoc @@ -301,7 +301,7 @@ link:https://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin re allows restricted resources on a web page to be requested from another domain outside the domain from which the first resource was served. -Quarkus comes with a CORS filter which implements the `javax.servlet.Filter` interface and intercepts all incoming HTTP +Quarkus comes with a CORS filter which implements the `jakarta.servlet.Filter` interface and intercepts all incoming HTTP requests. It can be enabled in the Quarkus configuration file, `src/main/resources/application.properties`: [source, properties] diff --git a/docs/src/main/asciidoc/jms.adoc b/docs/src/main/asciidoc/jms.adoc index 5d7f27d8b99a5..7d39cff258cbe 100644 --- a/docs/src/main/asciidoc/jms.adoc +++ b/docs/src/main/asciidoc/jms.adoc @@ -98,11 +98,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.jms.ConnectionFactory; -import javax.jms.JMSContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.JMSContext; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -148,14 +148,14 @@ package org.acme.jms; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.jms.ConnectionFactory; -import javax.jms.JMSConsumer; -import javax.jms.JMSContext; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.JMSConsumer; +import jakarta.jms.JMSContext; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -210,11 +210,11 @@ Create the `src/main/java/org/acme/jms/PriceResource.java` file with the followi ---- package org.acme.jms; -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 showing the last price. diff --git a/docs/src/main/asciidoc/kafka-reactive-getting-started.adoc b/docs/src/main/asciidoc/kafka-reactive-getting-started.adoc index 6e6e2a09e466c..3ddd222a421fd 100644 --- a/docs/src/main/asciidoc/kafka-reactive-getting-started.adoc +++ b/docs/src/main/asciidoc/kafka-reactive-getting-started.adoc @@ -156,11 +156,11 @@ package org.acme.kafka.producer; import java.util.UUID; -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.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.acme.kafka.model.Quote; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -208,7 +208,7 @@ package org.acme.kafka.processor; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.kafka.model.Quote; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc index 32a4abd5010e7..297d0b399616a 100644 --- a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc +++ b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc @@ -116,9 +116,9 @@ import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; import org.jboss.logging.Logger; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("/movies") public class MovieResource { @@ -178,11 +178,11 @@ from the `movies-from-kafka` channel and will expose it via Server-Sent Events: ---- package org.acme.kafka; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.acme.kafka.quarkus.Movie; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -445,10 +445,10 @@ import io.restassured.http.ContentType; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; -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 java.net.URI; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/docs/src/main/asciidoc/kafka-streams.adoc b/docs/src/main/asciidoc/kafka-streams.adoc index 7d8468d733e5d..839d448a705c8 100644 --- a/docs/src/main/asciidoc/kafka-streams.adoc +++ b/docs/src/main/asciidoc/kafka-streams.adoc @@ -126,7 +126,7 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.kafka.Record; @@ -359,8 +359,8 @@ package org.acme.kafka.streams.aggregator.streams; import java.time.Instant; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.acme.kafka.streams.aggregator.model.Aggregation; import org.acme.kafka.streams.aggregator.model.TemperatureMeasurement; @@ -594,8 +594,8 @@ one more method to the `KafkaStreamsPipeline` class which obtains the current st ---- package org.acme.kafka.streams.aggregator.streams; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.acme.kafka.streams.aggregator.model.Aggregation; import org.acme.kafka.streams.aggregator.model.WeatherStationData; @@ -723,13 +723,13 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.acme.kafka.streams.aggregator.streams.GetWeatherStationDataResult; import org.acme.kafka.streams.aggregator.streams.KafkaStreamsPipeline; @@ -942,15 +942,15 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -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 javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +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 jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.acme.kafka.streams.aggregator.streams.GetWeatherStationDataResult; import org.acme.kafka.streams.aggregator.streams.KafkaStreamsPipeline; diff --git a/docs/src/main/asciidoc/kafka.adoc b/docs/src/main/asciidoc/kafka.adoc index 0937bad429616..152940bc1d59a 100644 --- a/docs/src/main/asciidoc/kafka.adoc +++ b/docs/src/main/asciidoc/kafka.adoc @@ -108,7 +108,7 @@ Continuing from the previous minimal configuration, your Quarkus application can ---- import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PriceConsumer { @@ -179,11 +179,11 @@ Alternatively, your application can inject a `Multi` in your bean and subscribe import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.annotations.Channel; -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.resteasy.reactive.RestStreamElementType; @Path("/prices") @@ -250,8 +250,8 @@ For example, The following code illustrates how you can store incoming payloads import io.smallrye.reactive.messaging.annotations.Blocking; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; @ApplicationScoped public class PriceStorage { @@ -555,7 +555,7 @@ import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.OffsetAndTimestamp; import org.apache.kafka.clients.consumer.TopicPartition; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -603,7 +603,7 @@ import io.smallrye.reactive.messaging.kafka.IncomingKafkaRecord; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; @@ -724,7 +724,7 @@ package org.acme; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; @@ -822,7 +822,7 @@ With `AveragePriceEntity` being a JPA entity extending `CheckpointEntity`: ---- package org.acme; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.smallrye.reactivemessaging.kafka.CheckpointEntity; @@ -892,7 +892,7 @@ It can use `double` payloads as in the following snippet: import io.smallrye.mutiny.Multi; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.time.Duration; import java.util.Random; @@ -983,11 +983,11 @@ For this, you can use an `Emitter`. import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; @Path("/prices") public class PriceResource { @@ -1028,11 +1028,11 @@ import java.util.concurrent.CompletableFuture; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; @Path("/prices") public class PriceResource { @@ -1062,11 +1062,11 @@ You can therefore use Mutiny APIs for handling downstream messages and errors. ---- import org.eclipse.microprofile.reactive.messaging.Channel; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import io.smallrye.reactive.messaging.MutinyEmitter; @@ -1201,7 +1201,7 @@ In case of in-memory channels, `@Broadcast` annotation can be used on the `@Outg ---- import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; @@ -1246,7 +1246,7 @@ It can be injected as a regular emitter `@Channel`: [source, java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -1317,7 +1317,7 @@ A processor method can be simply implemented using both the `@Incoming` and `@Ou import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PriceProcessor { @@ -1340,7 +1340,7 @@ You can apply asynchronous stream processing by consuming and returning reactive [source,java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; @@ -1382,7 +1382,7 @@ The following example includes a batch of Kafka records inside a transaction. [source, java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -1450,9 +1450,9 @@ In rare cases, you may need to access the underlying Kafka clients. [source,java] ---- -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.apache.kafka.clients.producer.ProducerRecord; @@ -1489,9 +1489,9 @@ import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.clients.admin.KafkaAdminClient; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; @@ -1552,7 +1552,7 @@ import io.smallrye.reactive.messaging.annotations.Broadcast; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * A bean consuming data from the "fruit-in" channel and applying some price conversion. @@ -2325,10 +2325,10 @@ package org.acme; import java.util.concurrent.CompletionStage; -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.POST; +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.eclipse.microprofile.reactive.messaging.Emitter; @@ -2373,10 +2373,10 @@ package org.acme; import java.util.concurrent.CompletionStage; -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.POST; +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.eclipse.microprofile.reactive.messaging.Emitter; @@ -2412,7 +2412,7 @@ For simplicity purposes, our `Fruit` class is pretty simple: ---- package org.acme; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; @@ -2430,8 +2430,8 @@ To consume `Fruit` instances stored on a Kafka topic, and persist them into a da ---- package org.acme; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -2492,7 +2492,7 @@ For simplicity purposes, our `Fruit` class is pretty simple: ---- package org.acme; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; // <1> @@ -2511,8 +2511,8 @@ To consume `Fruit` instances stored on a Kafka topic, and persist them into a da ---- package org.acme; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -2601,9 +2601,9 @@ package org.acme; import java.util.concurrent.CompletionStage; -import javax.transaction.Transactional; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; @@ -2641,8 +2641,8 @@ The following example demonstrates how to receive a payload, store it in the dat ---- package org.acme; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -2748,10 +2748,10 @@ The following example demonstrates: ---- package org.acme; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.eclipse.microprofile.faulttolerance.Bulkhead; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -2797,11 +2797,11 @@ The next example demonstrates that using the Hibernate Reactive API (without Pan [source, java] ---- -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.eclipse.microprofile.faulttolerance.Bulkhead; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/docs/src/main/asciidoc/kotlin.adoc b/docs/src/main/asciidoc/kotlin.adoc index 32f1b264b9d29..4e5e51a0ffc95 100644 --- a/docs/src/main/asciidoc/kotlin.adoc +++ b/docs/src/main/asciidoc/kotlin.adoc @@ -38,10 +38,10 @@ The addition of `resteasy-reactive-jackson` in the extension list results in imp ---- package org.acme -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") class ReactiveGreetingResource { @@ -68,9 +68,9 @@ We also update the `ReactiveGreetingResource` class like so: [source,kotlin] ---- -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.core.MediaType @Path("/hello") class ReactiveGreetingResource { @@ -148,7 +148,7 @@ The generated `pom.xml` contains the following modifications compared to its cou - + @@ -169,10 +169,10 @@ In order to understand why this plugin is needed, first we need to note that by Having `final` classes however does not work well with various frameworks that need to create https://docs.oracle.com/javase/8/docs/technotes/guides/reflection/proxy.html[Dynamic Proxies]. Thus, the `all-open` Kotlin compiler plugin allows us to configure the compiler to *not* mark as `final` classes that have certain annotations. In the snippet above, -we have specified that classes annotated with `javax.ws.rs.Path` should not be `final`. +we have specified that classes annotated with `jakarta.ws.rs.Path` should not be `final`. -If your application contains Kotlin classes annotated with `javax.enterprise.context.ApplicationScoped` -for example, then `` needs to be added as well. Same goes for any class that needs to have a dynamic proxy created at runtime. +If your application contains Kotlin classes annotated with `jakarta.enterprise.context.ApplicationScoped` +for example, then `` needs to be added as well. Same goes for any class that needs to have a dynamic proxy created at runtime. Future versions of Quarkus will configure the Kotlin compiler plugin in a way that will make it unnecessary to alter this configuration. @@ -224,8 +224,8 @@ java { } allOpen { // <2> - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } @@ -292,8 +292,8 @@ java { } allOpen { // <2> - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } @@ -513,14 +513,14 @@ In the example below, this can be easily solved by adapting the annotation, addi [source,kotlin] ---- -import javax.inject.Inject -import javax.enterprise.inject.Default -import javax.enterprise.context.ApplicationScoped +import jakarta.inject.Inject +import jakarta.enterprise.inject.Default +import jakarta.enterprise.context.ApplicationScoped -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 @@ -555,12 +555,12 @@ Alternatively, prefer the use of constructor injection which works without modif [source,kotlin] ---- -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped -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 @ApplicationScoped class GreetingService { diff --git a/docs/src/main/asciidoc/lifecycle.adoc b/docs/src/main/asciidoc/lifecycle.adoc index b30f503c0833a..b4b453c3d4b2b 100644 --- a/docs/src/main/asciidoc/lifecycle.adoc +++ b/docs/src/main/asciidoc/lifecycle.adoc @@ -144,8 +144,8 @@ following content: ---- package org.acme.lifecycle; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -190,7 +190,7 @@ A bean represented by a class, producer method or field annotated with `@Startup ---- package org.acme.lifecycle; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Startup // <1> @ApplicationScoped diff --git a/docs/src/main/asciidoc/logging.adoc b/docs/src/main/asciidoc/logging.adoc index 911fc1ad52e47..e0a9abb078615 100644 --- a/docs/src/main/asciidoc/logging.adoc +++ b/docs/src/main/asciidoc/logging.adoc @@ -31,10 +31,10 @@ Internally Quarkus uses JBoss Logging; you can also use it inside your applicati ---- import org.jboss.logging.Logger; -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 ExampleResource { diff --git a/docs/src/main/asciidoc/mailer.adoc b/docs/src/main/asciidoc/mailer.adoc index 50247bed360f7..74f392a4ebd75 100644 --- a/docs/src/main/asciidoc/mailer.adoc +++ b/docs/src/main/asciidoc/mailer.adoc @@ -66,9 +66,9 @@ import io.quarkus.mailer.Mail; import io.quarkus.mailer.Mailer; import io.smallrye.common.annotation.Blocking; -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("/mail") // <1> public class MailResource { diff --git a/docs/src/main/asciidoc/micrometer.adoc b/docs/src/main/asciidoc/micrometer.adoc index 43215db440cb7..c8cbffcb4f40f 100644 --- a/docs/src/main/asciidoc/micrometer.adoc +++ b/docs/src/main/asciidoc/micrometer.adoc @@ -102,9 +102,9 @@ package org.acme.micrometer; import io.micrometer.core.instrument.MeterRegistry; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/example") @Produces("text/plain") diff --git a/docs/src/main/asciidoc/mongodb-panache.adoc b/docs/src/main/asciidoc/mongodb-panache.adoc index 6dd4f49dce37d..6ed6a033b0b35 100644 --- a/docs/src/main/asciidoc/mongodb-panache.adoc +++ b/docs/src/main/asciidoc/mongodb-panache.adoc @@ -991,9 +991,9 @@ It allows more advanced reactive use cases, for example, you can use it to send ---- import org.jboss.resteasy.reactive.RestStreamElementType; import org.reactivestreams.Publisher; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @GET @Path("/stream") @@ -1325,11 +1325,11 @@ And this resource: ---- import java.net.URI; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.Response; @Path("/persons") public class PersonResource { diff --git a/docs/src/main/asciidoc/mongodb.adoc b/docs/src/main/asciidoc/mongodb.adoc index d7d278dca2807..2795751a9baf2 100644 --- a/docs/src/main/asciidoc/mongodb.adoc +++ b/docs/src/main/asciidoc/mongodb.adoc @@ -149,8 +149,8 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import org.bson.Document; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; @@ -351,8 +351,8 @@ import io.quarkus.mongodb.reactive.ReactiveMongoCollection; import io.smallrye.mutiny.Uni; import org.bson.Document; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.List; @ApplicationScoped @@ -394,13 +394,13 @@ import io.smallrye.mutiny.Uni; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.core.MediaType; @Path("/reactive_fruits") @Produces(MediaType.APPLICATION_JSON) @@ -540,8 +540,8 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/docs/src/main/asciidoc/native-reference.adoc b/docs/src/main/asciidoc/native-reference.adoc index fc216a13e5a22..2e581e09f0633 100644 --- a/docs/src/main/asciidoc/native-reference.adoc +++ b/docs/src/main/asciidoc/native-reference.adoc @@ -671,10 +671,10 @@ add a new `TimestampResource` to the application that looks like this: ---- package org.acme; -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("/timestamp") public class TimestampResource { @@ -725,8 +725,8 @@ package org.acme; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.nio.charset.StandardCharsets; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -869,10 +869,10 @@ Add a REST resource with the following code ---- package org.acme; -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("/string-builder") public class StringBuilderResource { @@ -1061,10 +1061,10 @@ To demonstrate this, add this `MulticastResource` code to your project ---- package org.acme; -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 java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.DatagramChannel; @@ -1200,10 +1200,10 @@ package org.acme; import sun.misc.Unsafe; -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 java.lang.reflect.Field; @Path("/crash") diff --git a/docs/src/main/asciidoc/openapi-swaggerui.adoc b/docs/src/main/asciidoc/openapi-swaggerui.adoc index f2558a4d3fdb3..f8e5f7818dee5 100644 --- a/docs/src/main/asciidoc/openapi-swaggerui.adoc +++ b/docs/src/main/asciidoc/openapi-swaggerui.adoc @@ -65,10 +65,10 @@ public class Fruit { ---- package org.acme.openapi.swaggerui; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Set; @@ -111,7 +111,7 @@ package org.acme.openapi.swaggerui; import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; @@ -273,7 +273,7 @@ There are some MicroProfile OpenAPI annotations which describe global API inform All of this information (and more) can be included in your Java code by using appropriate OpenAPI annotations on a JAX-RS `Application` class. Because a JAX-RS `Application` class is not required in Quarkus, you will -likely have to create one. It can simply be an empty class that extends `javax.ws.rs.core.Application`. This +likely have to create one. It can simply be an empty class that extends `jakarta.ws.rs.core.Application`. This empty class can then be annotated with various OpenAPI annotations such as `@OpenAPIDefinition`. For example: [source, java] diff --git a/docs/src/main/asciidoc/opentelemetry.adoc b/docs/src/main/asciidoc/opentelemetry.adoc index 6136a9fe7c77c..ea75097b5a4de 100644 --- a/docs/src/main/asciidoc/opentelemetry.adoc +++ b/docs/src/main/asciidoc/opentelemetry.adoc @@ -72,10 +72,10 @@ Create a `src/main/java/org/acme/opentelemetry/TracedResource.java` file with th ---- package org.acme.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.jboss.logging.Logger; @Path("/hello") diff --git a/docs/src/main/asciidoc/opentracing.adoc b/docs/src/main/asciidoc/opentracing.adoc index 1494fe2d390f3..c13d939ca6d04 100644 --- a/docs/src/main/asciidoc/opentracing.adoc +++ b/docs/src/main/asciidoc/opentracing.adoc @@ -81,10 +81,10 @@ Create the `src/main/java/org/acme/opentracing/TracedResource.java` file with th ---- package org.acme.opentracing; -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; @Path("/hello") @@ -178,7 +178,7 @@ Here is an example of a `FrancophoneService` which methods are traced. [source, java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.opentracing.Traced; diff --git a/docs/src/main/asciidoc/optaplanner.adoc b/docs/src/main/asciidoc/optaplanner.adoc index 1de048f099bce..4b0a9bfc77c7e 100644 --- a/docs/src/main/asciidoc/optaplanner.adoc +++ b/docs/src/main/asciidoc/optaplanner.adoc @@ -618,9 +618,9 @@ package org.acme.optaplanner.rest; import java.util.UUID; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.acme.optaplanner.domain.TimeTable; import org.optaplanner.core.api.solver.SolverJob; @@ -751,7 +751,7 @@ package org.acme.optaplanner.solver; import java.time.DayOfWeek; import java.time.LocalTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.junit.QuarkusTest; import org.acme.optaplanner.domain.Lesson; @@ -819,7 +819,7 @@ import java.time.LocalTime; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.junit.QuarkusTest; import org.acme.optaplanner.domain.Room; @@ -956,11 +956,11 @@ and use those accordingly: ---- package org.acme.optaplanner.rest; -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; import io.quarkus.panache.common.Sort; import org.acme.optaplanner.domain.Lesson; @@ -1057,7 +1057,7 @@ Poll for the latest solution until the solver finishes solving: ---- package org.acme.optaplanner.rest; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.junit.QuarkusTest; import org.acme.optaplanner.domain.Lesson; diff --git a/docs/src/main/asciidoc/picocli.adoc b/docs/src/main/asciidoc/picocli.adoc index bc5fde66ac2d2..fc950d446b953 100644 --- a/docs/src/main/asciidoc/picocli.adoc +++ b/docs/src/main/asciidoc/picocli.adoc @@ -42,8 +42,8 @@ package com.acme.picocli; import picocli.CommandLine; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @CommandLine.Command // <1> public class HelloCommand implements Runnable { @@ -139,8 +139,8 @@ import io.quarkus.picocli.runtime.PicocliCommandLineFactory; import io.quarkus.picocli.runtime.annotations.TopCommand; import picocli.CommandLine; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; @TopCommand @CommandLine.Command @@ -245,7 +245,7 @@ import io.quarkus.runtime.QuarkusApplication; import io.quarkus.runtime.annotations.QuarkusMain; import picocli.CommandLine; -import javax.inject.Inject; +import jakarta.inject.Inject; @QuarkusMain @CommandLine.Command(name = "demo", mixinStandardHelpOptions = true) diff --git a/docs/src/main/asciidoc/quartz.adoc b/docs/src/main/asciidoc/quartz.adoc index ab735667530f4..e463f08d5efd6 100644 --- a/docs/src/main/asciidoc/quartz.adoc +++ b/docs/src/main/asciidoc/quartz.adoc @@ -87,9 +87,9 @@ In the `org.acme.quartz` package, create the `Task` class, with the following co ---- package org.acme.quartz; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.Instant; -import javax.persistence.Table; +import jakarta.persistence.Table; import io.quarkus.hibernate.orm.panache.PanacheEntity; @@ -117,9 +117,9 @@ In the `org.acme.quartz` package, create the `TaskBean` class, with the followin ---- package org.acme.quartz; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import io.quarkus.scheduler.Scheduled; @@ -241,10 +241,10 @@ package org.acme.quartz; 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("/tasks") public class TaskResource { diff --git a/docs/src/main/asciidoc/qute-reference.adoc b/docs/src/main/asciidoc/qute-reference.adoc index c0da62306af59..cfff9234e9656 100644 --- a/docs/src/main/asciidoc/qute-reference.adoc +++ b/docs/src/main/asciidoc/qute-reference.adoc @@ -1678,11 +1678,11 @@ If using <>, you can rely on ---- package org.acme.quarkus.sample; -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.qute.TemplateInstance; import io.quarkus.qute.Template; @@ -1738,10 +1738,10 @@ Use those static methods to build your template instances: ---- package org.acme.quarkus.sample; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.qute.TemplateInstance; @Path("hello") @@ -1768,7 +1768,7 @@ By default, the name of the `@CheckedTemplate` method is used as is. ---- package org.acme.quarkus.sample; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import io.quarkus.qute.TemplateInstance; import io.quarkus.qute.CheckedTemplate; @@ -2380,10 +2380,10 @@ The end result is that a using Qute within a JAX-RS resource may look as simple ---- package org.acme.quarkus.sample; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.qute.TemplateInstance; import io.quarkus.qute.Template; diff --git a/docs/src/main/asciidoc/qute.adoc b/docs/src/main/asciidoc/qute.adoc index a4d8be410882e..c6ae4ab28b4e4 100644 --- a/docs/src/main/asciidoc/qute.adoc +++ b/docs/src/main/asciidoc/qute.adoc @@ -80,10 +80,10 @@ Now let's inject the "compiled" template in the resource class. ---- package org.acme.quarkus.sample; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.qute.TemplateInstance; import io.quarkus.qute.Template; @@ -142,10 +142,10 @@ Now let's declare and use those templates in the resource class. ---- package org.acme.quarkus.sample; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.qute.TemplateInstance; import io.quarkus.qute.CheckedTemplate; @@ -177,10 +177,10 @@ Keep in mind this style of declaration allows you to reference templates declare ---- package org.acme.quarkus.sample; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.qute.TemplateInstance; @@ -261,11 +261,11 @@ Finally, let's create a resource class with type-safe templates: ---- package org.acme.quarkus.sample; -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.qute.TemplateInstance; import io.quarkus.qute.Template; @@ -322,11 +322,11 @@ Finally, let's create a resource class. ---- package org.acme.quarkus.sample; -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.qute.TemplateInstance; import io.quarkus.qute.Template; @@ -471,7 +471,7 @@ The template is simple: ---- package org.acme.quarkus.sample; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.qute.Template; import io.quarkus.qute.Location; diff --git a/docs/src/main/asciidoc/rabbitmq-reference.adoc b/docs/src/main/asciidoc/rabbitmq-reference.adoc index fe8a90bc5d753..e7bb380a417c4 100644 --- a/docs/src/main/asciidoc/rabbitmq-reference.adoc +++ b/docs/src/main/asciidoc/rabbitmq-reference.adoc @@ -88,7 +88,7 @@ package inbound; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class RabbitMQPriceConsumer { @@ -110,7 +110,7 @@ package inbound; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.concurrent.CompletionStage; @ApplicationScoped @@ -304,8 +304,8 @@ For example, The following code illustrates how you can store incoming payloads import io.smallrye.reactive.messaging.annotations.Blocking; import org.eclipse.microprofile.reactive.messaging.Incoming; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; @ApplicationScoped public class PriceStorage { @@ -875,4 +875,4 @@ Type: _string_ | false | Type: _string_ | false | `/` -|=== \ No newline at end of file +|=== diff --git a/docs/src/main/asciidoc/rabbitmq.adoc b/docs/src/main/asciidoc/rabbitmq.adoc index eaab10dde15bb..f9351c79d867c 100644 --- a/docs/src/main/asciidoc/rabbitmq.adoc +++ b/docs/src/main/asciidoc/rabbitmq.adoc @@ -159,11 +159,11 @@ package org.acme.rabbitmq.producer; import java.util.UUID; -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.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.acme.rabbitmq.model.Quote; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -217,7 +217,7 @@ package org.acme.rabbitmq.processor; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.rabbitmq.model.Quote; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/docs/src/main/asciidoc/reactive-event-bus.adoc b/docs/src/main/asciidoc/reactive-event-bus.adoc index 7c2da2420748a..651e1fb477083 100644 --- a/docs/src/main/asciidoc/reactive-event-bus.adoc +++ b/docs/src/main/asciidoc/reactive-event-bus.adoc @@ -63,7 +63,7 @@ package org.acme.vertx; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { @@ -112,7 +112,7 @@ package org.acme.vertx; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import io.smallrye.mutiny.Uni; @@ -240,11 +240,11 @@ import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.eventbus.EventBus; import io.vertx.mutiny.core.eventbus.Message; -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("/async") public class EventResource { @@ -312,11 +312,11 @@ import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.eventbus.EventBus; import io.vertx.mutiny.core.eventbus.Message; -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("/async") public class EventResource { @@ -346,7 +346,7 @@ package org.acme.vertx; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/docs/src/main/asciidoc/reactive-routes.adoc b/docs/src/main/asciidoc/reactive-routes.adoc index 04a39e0a3856a..d7021e2b29e7f 100644 --- a/docs/src/main/asciidoc/reactive-routes.adoc +++ b/docs/src/main/asciidoc/reactive-routes.adoc @@ -68,7 +68,7 @@ import io.quarkus.vertx.web.Route.HttpMethod; import io.quarkus.vertx.web.RoutingExchange; import io.vertx.ext.web.RoutingContext; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped // <1> public class MyDeclarativeRoutes { @@ -95,7 +95,7 @@ public class MyDeclarativeRoutes { } } ---- -<1> If there is a reactive route found on a class with no scope annotation then `@javax.inject.Singleton` is added automatically. +<1> If there is a reactive route found on a class with no scope annotation then `@jakarta.inject.Singleton` is added automatically. <2> The `@Route` annotation indicates that the method is a reactive route. Again, by default, the code contained in the method must not block. <3> The method gets a https://vertx.io/docs/apidocs/io/vertx/ext/web/RoutingContext.html[`RoutingContext`] as a parameter. From the `RoutingContext` you can retrieve the HTTP request (using `request()`) and write the response using `response().end(...)`. <4> If the annotated method does not return `void` the arguments are optional. diff --git a/docs/src/main/asciidoc/reactive-sql-clients.adoc b/docs/src/main/asciidoc/reactive-sql-clients.adoc index 98c7fbed5f234..b9f30a8d41767 100644 --- a/docs/src/main/asciidoc/reactive-sql-clients.adoc +++ b/docs/src/main/asciidoc/reactive-sql-clients.adoc @@ -734,7 +734,7 @@ Here's an example for PostgreSQL: [source,java] ---- -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.reactive.pg.client.PgPoolCreator; import io.vertx.pgclient.PgConnectOptions; diff --git a/docs/src/main/asciidoc/redis.adoc b/docs/src/main/asciidoc/redis.adoc index 1916e4cc31d83..7c4a5f18ca169 100644 --- a/docs/src/main/asciidoc/redis.adoc +++ b/docs/src/main/asciidoc/redis.adoc @@ -104,8 +104,8 @@ Create the `src/main/java/org/acme/redis/IncrementService.java` file, with the f ---- package org.acme.redis; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.redis.datasource.ReactiveRedisDataSource; import io.quarkus.redis.datasource.RedisDataSource; @@ -177,12 +177,12 @@ Create the `src/main/java/org/acme/redis/IncrementResource.java` file, with the ---- package org.acme.redis; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.POST; -import javax.ws.rs.DELETE; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.DELETE; import java.util.List; import io.smallrye.mutiny.Uni; diff --git a/docs/src/main/asciidoc/rest-client-multipart.adoc b/docs/src/main/asciidoc/rest-client-multipart.adoc index bd13bb7bc0698..ebd46c0ab0b4f 100644 --- a/docs/src/main/asciidoc/rest-client-multipart.adoc +++ b/docs/src/main/asciidoc/rest-client-multipart.adoc @@ -69,8 +69,8 @@ package org.acme.rest.client.multipart; 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; @@ -99,11 +99,11 @@ Using the RESTEasy REST Client is as simple as creating an interface using the p ---- package org.acme.rest.client.multipart; -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.annotations.providers.multipart.MultipartForm; @@ -168,11 +168,11 @@ package org.acme.rest.client.multipart; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -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; @@ -208,11 +208,11 @@ Create the directory `src/main/java/org/acme/rest/client/multipart/server` and i ---- package org.acme.rest.client.multipart.server; -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; @Path("/echo") public class EchoService { diff --git a/docs/src/main/asciidoc/rest-client-reactive.adoc b/docs/src/main/asciidoc/rest-client-reactive.adoc index 4bd6631f2a20d..5f023ddaa2f9c 100644 --- a/docs/src/main/asciidoc/rest-client-reactive.adoc +++ b/docs/src/main/asciidoc/rest-client-reactive.adoc @@ -98,9 +98,9 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.Set; @Path("/extensions") @@ -148,10 +148,10 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.reactive.RestQuery; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.Map; import java.util.Set; @@ -232,10 +232,10 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import java.util.Set; @Path("/extensions") @@ -280,7 +280,7 @@ public interface ExtensionsService { ---- # Your configuration properties quarkus.rest-client.extensions-api.url=https://stage.code.quarkus.io/api -quarkus.rest-client.extensions-api.scope=javax.inject.Singleton +quarkus.rest-client.extensions-api.scope=jakarta.inject.Singleton ---- === Disabling Hostname Verification @@ -307,8 +307,8 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.Set; @Path("/extension") @@ -342,9 +342,9 @@ With this approach the client interface could look as follows: ---- package org.acme.rest.client; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.Set; @Path("/extensions") @@ -362,8 +362,8 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.net.URI; import java.util.Set; @@ -403,8 +403,8 @@ Let's see an example about how to provide the HTTP Client Options via CDI: ---- package org.acme.rest.client; -import javax.enterprise.inject.Produces; -import javax.ws.rs.ext.ContextResolver; +import jakarta.enterprise.inject.Produces; +import jakarta.ws.rs.ext.ContextResolver; import io.vertx.core.http.HttpClientOptions; import io.quarkus.arc.Unremovable; @@ -431,8 +431,8 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.net.URI; import java.util.Set; @@ -519,9 +519,9 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.Set; import java.util.concurrent.CompletionStage; @@ -545,8 +545,8 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.Set; import java.util.concurrent.CompletionStage; @@ -602,9 +602,9 @@ package org.acme.rest.client; import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.Set; @Path("/extensions") @@ -627,8 +627,8 @@ package org.acme.rest.client; import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.inject.RestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.Set; @Path("/extension") @@ -691,10 +691,10 @@ import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.Set; @Path("/extensions") @@ -730,9 +730,9 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.UUID; @ApplicationScoped @@ -767,9 +767,9 @@ import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.UUID; @ApplicationScoped @@ -1069,8 +1069,8 @@ Let's assume you have the following client: ---- package io.quarkus.it.rest.client.main; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/docs/src/main/asciidoc/rest-client.adoc b/docs/src/main/asciidoc/rest-client.adoc index 680315e9376d8..68819f809131c 100644 --- a/docs/src/main/asciidoc/rest-client.adoc +++ b/docs/src/main/asciidoc/rest-client.adoc @@ -112,9 +112,9 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.annotations.jaxrs.QueryParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.Set; @Path("/extensions") @@ -160,8 +160,8 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.annotations.jaxrs.PathParam; import org.jboss.resteasy.annotations.jaxrs.QueryParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.Set; @Path("/extensions") @@ -184,7 +184,7 @@ The name of the property needs to follow a certain convention which is best disp ---- # Your configuration properties quarkus.rest-client."org.acme.rest.client.ExtensionsService".url=https://stage.code.quarkus.io/api # // <1> -quarkus.rest-client."org.acme.rest.client.ExtensionsService".scope=javax.inject.Singleton # // <2> +quarkus.rest-client."org.acme.rest.client.ExtensionsService".scope=jakarta.inject.Singleton # // <2> ---- <1> Having this configuration means that all requests performed using `ExtensionsService` will use `https://stage.code.quarkus.io` as the base URL. @@ -201,7 +201,7 @@ The standard MicroProfile Rest Client properties notation can also be used to co [source,properties] ---- org.acme.rest.client.ExtensionsService/mp-rest/url=https://stage.code.quarkus.io/api -org.acme.rest.client.ExtensionsService/mp-rest/scope=javax.inject.Singleton +org.acme.rest.client.ExtensionsService/mp-rest/scope=jakarta.inject.Singleton ---- If a property is specified via both the Quarkus notation and the MicroProfile notation, the Quarkus notation takes a precedence. @@ -223,7 +223,7 @@ public interface ExtensionsService { ---- # Your configuration properties quarkus.rest-client.extensions-api.url=https://stage.code.quarkus.io/api -quarkus.rest-client.extensions-api.scope=javax.inject.Singleton +quarkus.rest-client.extensions-api.scope=jakarta.inject.Singleton ---- === Disabling Hostname Verification @@ -275,9 +275,9 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.annotations.jaxrs.PathParam; -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 java.util.Set; @Path("/extension") @@ -353,8 +353,8 @@ package org.acme.rest.client; import java.util.Set; 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 org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.annotations.jaxrs.QueryParam; @@ -381,9 +381,9 @@ package org.acme.rest.client; import java.util.Set; import java.util.concurrent.CompletionStage; -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 org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.annotations.jaxrs.PathParam; @@ -436,8 +436,8 @@ package org.acme.rest.client; import java.util.Set; 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 org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.annotations.jaxrs.QueryParam; @@ -464,9 +464,9 @@ package org.acme.rest.client; import java.util.Set; import java.util.concurrent.CompletionStage; -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 org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.annotations.jaxrs.PathParam; @@ -529,8 +529,8 @@ package org.acme.rest.client; import java.util.Set; 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 org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @@ -562,9 +562,9 @@ package org.acme.rest.client; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.UUID; @ApplicationScoped diff --git a/docs/src/main/asciidoc/rest-data-panache.adoc b/docs/src/main/asciidoc/rest-data-panache.adoc index 5506edf988b22..17d11e65b702a 100644 --- a/docs/src/main/asciidoc/rest-data-panache.adoc +++ b/docs/src/main/asciidoc/rest-data-panache.adoc @@ -345,13 +345,13 @@ And this method will be exposed along with the generated methods using `http://l == Securing endpoints -REST Data with Panache will use the Security annotations within the package `javax.annotation.security` that are defined on your resource interfaces: +REST Data with Panache will use the Security annotations within the package `jakarta.annotation.security` that are defined on your resource interfaces: [source,java] ---- -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; @DenyAll @ResourceProperties diff --git a/docs/src/main/asciidoc/rest-json.adoc b/docs/src/main/asciidoc/rest-json.adoc index 62be7a6e4496b..e3495cae5a666 100644 --- a/docs/src/main/asciidoc/rest-json.adoc +++ b/docs/src/main/asciidoc/rest-json.adoc @@ -138,10 +138,10 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Set; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/fruits") public class FruitResource { @@ -213,7 +213,7 @@ An example where a custom module needs to be registered would look like so: ---- import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class RegisterCustomModuleCustomizer implements ObjectMapperCustomizer { @@ -234,7 +234,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.arc.All; import io.quarkus.jackson.ObjectMapperCustomizer; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; public class CustomObjectMapper { @@ -271,9 +271,9 @@ If for example a custom serializer named `FooSerializer` for type `com.example.F [source,java] ---- import io.quarkus.jsonb.JsonbConfigCustomizer; -import javax.inject.Singleton; -import javax.json.bind.JsonbConfig; -import javax.json.bind.serializer.JsonbSerializer; +import jakarta.inject.Singleton; +import jakarta.json.bind.JsonbConfig; +import jakarta.json.bind.serializer.JsonbSerializer; @Singleton public class FooSerializerRegistrationCustomizer implements JsonbConfigCustomizer { @@ -284,17 +284,17 @@ public class FooSerializerRegistrationCustomizer implements JsonbConfigCustomize } ---- -A more advanced option would be to directly provide a bean of `javax.json.bind.JsonbConfig` (with a `Dependent` scope) or in the extreme case to provide a bean of type `javax.json.bind.Jsonb` (with a `Singleton` scope). -If the latter approach is leveraged it is very important to manually inject and apply all `io.quarkus.jsonb.JsonbConfigCustomizer` beans in the CDI producer that produces `javax.json.bind.Jsonb`. +A more advanced option would be to directly provide a bean of `jakarta.json.bind.JsonbConfig` (with a `Dependent` scope) or in the extreme case to provide a bean of type `jakarta.json.bind.Jsonb` (with a `Singleton` scope). +If the latter approach is leveraged it is very important to manually inject and apply all `io.quarkus.jsonb.JsonbConfigCustomizer` beans in the CDI producer that produces `jakarta.json.bind.Jsonb`. Failure to do so will prevent JSON-B specific customizations provided by various extensions from being applied. [source,java] ---- import io.quarkus.jsonb.JsonbConfigCustomizer; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.json.bind.JsonbConfig; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.json.bind.JsonbConfig; public class CustomJsonbConfig { @@ -420,9 +420,9 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; -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("/legumes") public class LegumeResource { diff --git a/docs/src/main/asciidoc/resteasy-reactive-migration.adoc b/docs/src/main/asciidoc/resteasy-reactive-migration.adoc index 96caaba04f23f..8822ed0b8cf00 100644 --- a/docs/src/main/asciidoc/resteasy-reactive-migration.adoc +++ b/docs/src/main/asciidoc/resteasy-reactive-migration.adoc @@ -94,13 +94,13 @@ The following table matches the legacy RESTEasy annotations with the new RESTEas |=== NOTE: The previous table does not include the `org.jboss.resteasy.annotations.Form` annotation because there is no RESTEasy Reactive specific replacement for it. -Users are instead encouraged to use the JAX-RS standard `javax.ws.rs.BeanParam` annotation which is supported on both the server and the client. +Users are instead encouraged to use the JAX-RS standard `jakarta.ws.rs.BeanParam` annotation which is supported on both the server and the client. === JAX-RS providers Although RESTEasy Reactive provides the same spec compliant behavior as RESTEasy Classic does, it does not include the same exact provider implementations at runtime. -The most common case where the difference in providers might result in different behavior, is the included `javax.ws.rs.ext.ExceptionMapper` implementations. To see what classes are included in the application, launch the application in dev mode and navigate to http://localhost:8080/q/dev/io.quarkus.quarkus-resteasy-reactive/exception-mappers. +The most common case where the difference in providers might result in different behavior, is the included `jakarta.ws.rs.ext.ExceptionMapper` implementations. To see what classes are included in the application, launch the application in dev mode and navigate to http://localhost:8080/q/dev/io.quarkus.quarkus-resteasy-reactive/exception-mappers. ==== Service Loading diff --git a/docs/src/main/asciidoc/resteasy-reactive.adoc b/docs/src/main/asciidoc/resteasy-reactive.adoc index 45ecdb31be79e..a6b075eccf14b 100644 --- a/docs/src/main/asciidoc/resteasy-reactive.adoc +++ b/docs/src/main/asciidoc/resteasy-reactive.adoc @@ -7,13 +7,13 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc include::_attributes.adoc[] :categories: web :summary: Discover how to develop highly scalable reactive REST services with JAX-RS and RESTEasy Reactive. -:jaxrsapi: https://javadoc.io/doc/javax.ws.rs/javax.ws.rs-api/2.1.1 -:jaxrsspec: /specs/jaxrs/2.1/index.html +:jaxrsapi: https://javadoc.io/doc/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0 +:jaxrsspec: https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html :jdkapi: https://docs.oracle.com/en/java/javase/11/docs/api/java.base -:mutinyapi: https://javadoc.io/doc/io.smallrye.reactive/mutiny/1.6.0 +:mutinyapi: https://javadoc.io/doc/io.smallrye.reactive/mutiny/2.1.0 :httpspec: https://tools.ietf.org/html/rfc7231 -:jsonpapi: https://javadoc.io/doc/javax.json/javax.json-api/1.1.4 -:injectapi: https://javadoc.io/static/jakarta.inject/jakarta.inject/1 +:jsonpapi: https://javadoc.io/doc/jakarta.json/jakarta.json-api/1.1.4 +:injectapi: https://javadoc.io/static/jakarta.inject/jakarta.inject-api/2.0.1 :vertxapi: https://javadoc.io/doc/io.vertx/vertx-core/latest/index.html :resteasy-reactive-api: https://javadoc.io/doc/io.quarkus.resteasy.reactive/resteasy-reactive/{quarkus-version} :resteasy-reactive-common-api: https://javadoc.io/doc/io.quarkus.resteasy.reactive/resteasy-reactive-common/{quarkus-version} @@ -64,8 +64,8 @@ You can now write your first endpoint in the `org.acme.rest.Endpoint` class: ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("") public class Endpoint { @@ -91,21 +91,21 @@ HTTP response:: the response part of the HTTP call, consisting of an HTTP respon === Declaring endpoints: URI mapping -Any class annotated with a link:{jaxrsapi}/javax/ws/rs/Path.html[`@Path`] annotation can have its methods exposed as REST endpoints, +Any class annotated with a link:{jaxrsapi}/jakarta/ws/rs/Path.html[`@Path`] annotation can have its methods exposed as REST endpoints, provided they have an HTTP method annotation (see below). -That link:{jaxrsapi}/javax/ws/rs/Path.html[`@Path`] annotation defines the URI prefix under which those methods will be exposed. It can +That link:{jaxrsapi}/jakarta/ws/rs/Path.html[`@Path`] annotation defines the URI prefix under which those methods will be exposed. It can be empty, or contain a prefix such as `rest` or `rest/V1`. -Each exposed endpoint method can in turn have another link:{jaxrsapi}/javax/ws/rs/Path.html[`@Path`] annotation which adds to its containing +Each exposed endpoint method can in turn have another link:{jaxrsapi}/jakarta/ws/rs/Path.html[`@Path`] annotation which adds to its containing class annotation. For example, this defines a `rest/hello` endpoint: [source,java] ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("rest") public class Endpoint { @@ -126,8 +126,8 @@ You can set the root path for all rest endpoints using the `@ApplicationPath` an ---- package org.acme.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/api") public static class MyApplication extends Application { @@ -148,31 +148,31 @@ method will be mapped to the method: |=== |Annotation|Usage -|link:{jaxrsapi}/javax/ws/rs/GET.html[`@GET`] +|link:{jaxrsapi}/jakarta/ws/rs/GET.html[`@GET`] |Obtain a resource representation, should not modify state, link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.1[HTTP docs]) -|link:{jaxrsapi}/javax/ws/rs/HEAD.html[`@HEAD`] +|link:{jaxrsapi}/jakarta/ws/rs/HEAD.html[`@HEAD`] |Obtain metadata about a resource, similar to `GET` with no body (link:{httpspec}#section-4.3.2[HTTP docs]) -|link:{jaxrsapi}/javax/ws/rs/POST.html[`@POST`] +|link:{jaxrsapi}/jakarta/ws/rs/POST.html[`@POST`] |Create a resource and obtain a link to it (link:{httpspec}#section-4.3.3[HTTP docs]) -|link:{jaxrsapi}/javax/ws/rs/PUT.html[`@PUT`] +|link:{jaxrsapi}/jakarta/ws/rs/PUT.html[`@PUT`] |Replace a resource or create one, should be link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.4[HTTP docs]) -|link:{jaxrsapi}/javax/ws/rs/DELETE.html[`@DELETE`] +|link:{jaxrsapi}/jakarta/ws/rs/DELETE.html[`@DELETE`] |Delete an existing resource, link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.5[HTTP docs]) -|link:{jaxrsapi}/javax/ws/rs/OPTIONS.html[`@OPTIONS`] +|link:{jaxrsapi}/jakarta/ws/rs/OPTIONS.html[`@OPTIONS`] |Obtain information about a resource, link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.7[HTTP docs]) -|link:{jaxrsapi}/javax/ws/rs/PATCH.html[`@PATCH`] +|link:{jaxrsapi}/jakarta/ws/rs/PATCH.html[`@PATCH`] |Update a resource, or create one, not link:{httpspec}#section-4.2.2[idempotent] (https://tools.ietf.org/html/rfc5789#section-2[HTTP docs]) |=== You can also declare other HTTP methods by declaring them as an annotation with the -link:{jaxrsapi}/javax/ws/rs/HttpMethod.html[`@HttpMethod`] annotation: +link:{jaxrsapi}/jakarta/ws/rs/HttpMethod.html[`@HttpMethod`] annotation: [source,java] ---- @@ -181,8 +181,8 @@ package org.acme.rest; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Path; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Path; @Retention(RetentionPolicy.RUNTIME) @HttpMethod("CHEESE") @@ -211,16 +211,16 @@ link:{httpspec}#section-3.1.1.1[MIME (Media Type)] values, such as the following - `text/*` which is a sub-type wildcard for any text media type - `\*/*` which is a wildcard for any media type -You may annotate your endpoint class with the link:{jaxrsapi}/javax/ws/rs/Produces.html[`@Produces`] -or link:{jaxrsapi}/javax/ws/rs/Consumes.html[`@Consumes`] annotations, which +You may annotate your endpoint class with the link:{jaxrsapi}/jakarta/ws/rs/Produces.html[`@Produces`] +or link:{jaxrsapi}/jakarta/ws/rs/Consumes.html[`@Consumes`] annotations, which allow you to specify one or more media types that your endpoint may accept as HTTP request body or produce as HTTP response body. Those class annotations apply to each method. -Any method may also be annotated with the link:{jaxrsapi}/javax/ws/rs/Produces.html[`@Produces`] -or link:{jaxrsapi}/javax/ws/rs/Consumes.html[`@Consumes`] annotations, in which +Any method may also be annotated with the link:{jaxrsapi}/jakarta/ws/rs/Produces.html[`@Produces`] +or link:{jaxrsapi}/jakarta/ws/rs/Consumes.html[`@Consumes`] annotations, in which case they override any eventual class annotation. -The link:{jaxrsapi}/javax/ws/rs/core/MediaType.html[`MediaType`] class has many constants you +The link:{jaxrsapi}/jakarta/ws/rs/core/MediaType.html[`MediaType`] class has many constants you can use to point to specific pre-defined media types. See <> for more information. @@ -286,8 +286,8 @@ Then you could obtain all the various parameters with this endpoint method: ---- package org.acme.rest; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.RestCookie; import org.jboss.resteasy.reactive.RestForm; @@ -317,12 +317,12 @@ NOTE: The link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestPa annotation is optional: any parameter whose name matches an existing URI template variable will be automatically assumed to have link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestPath.html[`@RestPath`]. -You can also use any of the JAX-RS annotations link:{jaxrsapi}/javax/ws/rs/PathParam.html[`@PathParam`], -link:{jaxrsapi}/javax/ws/rs/QueryParam.html[`@QueryParam`], -link:{jaxrsapi}/javax/ws/rs/HeaderParam.html[`@HeaderParam`], -link:{jaxrsapi}/javax/ws/rs/CookieParam.html[`@CookieParam`], -link:{jaxrsapi}/javax/ws/rs/FormParam.html[`@FormParam`] or -link:{jaxrsapi}/javax/ws/rs/MatrixParam.html[`@MatrixParam`] for this, +You can also use any of the JAX-RS annotations link:{jaxrsapi}/jakarta/ws/rs/PathParam.html[`@PathParam`], +link:{jaxrsapi}/jakarta/ws/rs/QueryParam.html[`@QueryParam`], +link:{jaxrsapi}/jakarta/ws/rs/HeaderParam.html[`@HeaderParam`], +link:{jaxrsapi}/jakarta/ws/rs/CookieParam.html[`@CookieParam`], +link:{jaxrsapi}/jakarta/ws/rs/FormParam.html[`@FormParam`] or +link:{jaxrsapi}/jakarta/ws/rs/MatrixParam.html[`@MatrixParam`] for this, but they require you to specify the parameter name. See <> for more advanced use-cases. @@ -349,8 +349,8 @@ so we can rewrite the previous example like this: ---- package org.acme.rest; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.RestCookie; import org.jboss.resteasy.reactive.RestForm; @@ -403,8 +403,8 @@ the following endpoint will serve requests for `/hello/stef/23` and `/hello` but ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("hello") public class Endpoint { @@ -461,8 +461,8 @@ The following parameter types will be supported out of the box: |link:{jdkapi}/java/math/BigDecimal.html[`BigDecimal`], link:{jdkapi}/java/math/BigInteger.html[`BigInteger`] |Large integers and decimals. -|link:{jsonpapi}/javax/json/JsonArray.html[`JsonArray`], link:{jsonpapi}/javax/json/JsonObject.html[`JsonObject`], -link:{jsonpapi}/javax/json/JsonStructure.html[`JsonStructure`], link:{jsonpapi}/javax/json/JsonValue.html[`JsonValue`] +|link:{jsonpapi}/jakarta/json/JsonArray.html[`JsonArray`], link:{jsonpapi}/jakarta/json/JsonObject.html[`JsonObject`], +link:{jsonpapi}/jakarta/json/JsonStructure.html[`JsonStructure`], link:{jsonpapi}/jakarta/json/JsonValue.html[`JsonValue`] |JSON value types |link:{vertxapi}io/vertx/core/buffer/Buffer.html[`Buffer`] @@ -488,9 +488,9 @@ the following endpoint: [source,java] ---- -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; @@ -594,7 +594,7 @@ public static class Resource { ==== Handling malformed input -As part of reading the multipart body, RESTEasy Reactive invokes the proper MessageBodyReaderlink:{jaxrsapi}/javax/ws/rs/ext/MessageBodyReader.html[`MessageBodyReader`] for each part of the request. +As part of reading the multipart body, RESTEasy Reactive invokes the proper MessageBodyReaderlink:{jaxrsapi}/jakarta/ws/rs/ext/MessageBodyReader.html[`MessageBodyReader`] for each part of the request. If an `IOException` occurs for one of these parts (for example if Jackson was unable to deserialize a JSON part), then a `org.jboss.resteasy.reactive.server.multipart.MultipartPartReadingException` is thrown. If this exception is not handled by the application as mentioned in <>, an HTTP 400 response is returned by default. @@ -605,7 +605,7 @@ that will hold the information we want to expose as: [source,java] ---- -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; @@ -625,10 +625,10 @@ And then expose this POJO via a Resource like so: [source,java] ---- -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("multipart") public class Endpoint { @@ -646,10 +646,10 @@ Additionally, you can also manually append the parts of the form using the class [source,java] ---- -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.server.multipart.MultipartFormDataOutput; @@ -723,10 +723,10 @@ import java.time.Duration; import java.time.Instant; import java.util.Date; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.NewCookie; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NewCookie; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder; @@ -750,7 +750,7 @@ public class Endpoint { } ---- -NOTE: You can also use the JAX-RS type link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`] but it is +NOTE: You can also use the JAX-RS type link:{jaxrsapi}/jakarta/ws/rs/core/Response.html[`Response`] but it is not strongly typed to your entity. ==== Using annotations @@ -766,8 +766,8 @@ import org.jboss.resteasy.reactive.Header; import org.jboss.resteasy.reactive.ResponseHeaders; import org.jboss.resteasy.reactive.ResponseStatus; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("") public class Endpoint { @@ -797,11 +797,11 @@ package org.acme.rest; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.RestResponse; @Path("/fruits") @@ -852,7 +852,7 @@ public class FruitResource { ==== Using RedirectException -Users can also throw `javax.ws.rs.RedirectionException` from a method body to get RESTEasy Reactive to perform the desired redirect. +Users can also throw `jakarta.ws.rs.RedirectionException` from a method body to get RESTEasy Reactive to perform the desired redirect. === Async/reactive support @@ -869,8 +869,8 @@ which will be mapped to a response exactly according to the previously described ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.mutiny.Uni; @@ -905,9 +905,9 @@ text data: ---- package org.acme.rest; -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 org.eclipse.microprofile.reactive.messaging.Channel; @@ -936,7 +936,7 @@ response. Exception mappers are also not invoked because part of the response ma If you want to stream JSON objects in your response, you can use https://html.spec.whatwg.org/multipage/server-sent-events.html[Server-Sent Events] by just annotating your endpoint method with -link:{jaxrsapi}/javax/ws/rs/Produces.html[`@Produces(MediaType.SERVER_SENT_EVENTS)`] +link:{jaxrsapi}/jakarta/ws/rs/Produces.html[`@Produces(MediaType.SERVER_SENT_EVENTS)`] and specifying that each element should be <> with `@RestStreamElementType(MediaType.APPLICATION_JSON)`. @@ -944,11 +944,11 @@ and specifying that each element should be <> with ---- package org.acme.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.jboss.resteasy.reactive.RestStreamElementType; @@ -1001,40 +1001,40 @@ method takes parameters of the following type: |=== |Type|Usage -|link:{jaxrsapi}/javax/ws/rs/core/HttpHeaders.html[`HttpHeaders`] +|link:{jaxrsapi}/jakarta/ws/rs/core/HttpHeaders.html[`HttpHeaders`] |All the request headers -|link:{jaxrsapi}/javax/ws/rs/container/ResourceInfo.html[`ResourceInfo`] +|link:{jaxrsapi}/jakarta/ws/rs/container/ResourceInfo.html[`ResourceInfo`] |Information about the current endpoint method and class (requires reflection) -|link:{jaxrsapi}/javax/ws/rs/core/SecurityContext.html[`SecurityContext`] +|link:{jaxrsapi}/jakarta/ws/rs/core/SecurityContext.html[`SecurityContext`] |Access to the current user and roles |link:{resteasy-reactive-api}/org/jboss/resteasy/reactive/server/SimpleResourceInfo.html[`SimpleResourceInfo`] |Information about the current endpoint method and class (no reflection required) -|link:{jaxrsapi}/javax/ws/rs/core/UriInfo.html[`UriInfo`] +|link:{jaxrsapi}/jakarta/ws/rs/core/UriInfo.html[`UriInfo`] |Provides information about the current endpoint and application URI -|link:{jaxrsapi}/javax/ws/rs/core/Application.html[`Application`] +|link:{jaxrsapi}/jakarta/ws/rs/core/Application.html[`Application`] |Advanced: Current JAX-RS application class -|link:{jaxrsapi}/javax/ws/rs/core/Configuration.html[`Configuration`] +|link:{jaxrsapi}/jakarta/ws/rs/core/Configuration.html[`Configuration`] |Advanced: Configuration about the deployed JAX-RS application -|link:{jaxrsapi}/javax/ws/rs/ext/Providers.html[`Providers`] +|link:{jaxrsapi}/jakarta/ws/rs/ext/Providers.html[`Providers`] |Advanced: Runtime access to JAX-RS providers -|link:{jaxrsapi}/javax/ws/rs/core/Request.html[`Request`] +|link:{jaxrsapi}/jakarta/ws/rs/core/Request.html[`Request`] |Advanced: Access to the current HTTP method and <> -|link:{jaxrsapi}/javax/ws/rs/core/ResourceContext.html[`ResourceContext`] +|link:{jaxrsapi}/jakarta/ws/rs/core/ResourceContext.html[`ResourceContext`] |Advanced: access to instances of endpoints |link:{resteasy-reactive-api}/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.html[`ServerRequestContext`] |Advanced: RESTEasy Reactive access to the current request/response -|link:{jaxrsapi}/javax/ws/rs/sse/Sse.html[`Sse`] +|link:{jaxrsapi}/jakarta/ws/rs/sse/Sse.html[`Sse`] |Advanced: Complex SSE use-cases |link:{vertxapi}/io/vertx/core/http/HttpServerRequest.html[`HttpServerRequest`] @@ -1053,9 +1053,9 @@ package org.acme.rest; import java.security.Principal; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.SecurityContext; @Path("user") public class Endpoint { @@ -1069,7 +1069,7 @@ public class Endpoint { ---- You can also inject those context objects using -{injectapi}/javax/inject/Inject.html[`@Inject`] on fields of the same +{injectapi}/jakarta/inject/Inject.html[`@Inject`] on fields of the same type: [source,java] @@ -1078,11 +1078,11 @@ package org.acme.rest; import java.security.Principal; -import javax.inject.Inject; +import jakarta.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.SecurityContext; @Path("user") public class Endpoint { @@ -1106,9 +1106,9 @@ package org.acme.rest; import java.security.Principal; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.SecurityContext; @Path("user") public class Endpoint { @@ -1203,8 +1203,8 @@ A very simple JAX-RS Resource that uses `Person` could be: ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("person") public class Person { @@ -1745,7 +1745,7 @@ You can override this behaviour using the https://javadoc.io/doc/io.smallrye.common/smallrye-common-annotation/1.5.0/io/smallrye/common/annotation/Blocking.html[`@Blocking`] and https://javadoc.io/doc/io.smallrye.common/smallrye-common-annotation/1.5.0/io/smallrye/common/annotation/NonBlocking.html[`@NonBlocking`] -annotations. This can be applied at the method, class or `javax.ws.rs.core.Application` level. +annotations. This can be applied at the method, class or `jakarta.ws.rs.core.Application` level. The example below will override the default behaviour and always run on a worker thread, even though it returns a `Uni`. @@ -1753,8 +1753,8 @@ The example below will override the default behaviour and always run on a worker ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.common.annotation.Blocking; @@ -1781,8 +1781,8 @@ package org.acme.rest; import java.time.Duration; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.mutiny.Uni; @@ -1798,13 +1798,13 @@ public class Endpoint { } ---- -If a method or class is annotated with `javax.transaction.Transactional` then it will also be treated as a blocking +If a method or class is annotated with `jakarta.transaction.Transactional` then it will also be treated as a blocking method. This is because JTA is a blocking technology, and is generally used with other blocking technology such as Hibernate and JDBC. An explicit `@Blocking` or `@NonBlocking` on the class will override this behaviour. ==== Overriding the default behaviour -If you want to override the default behaviour you can annotate a `javax.ws.rs.core.Application` subclass in your application +If you want to override the default behaviour you can annotate a `jakarta.ws.rs.core.Application` subclass in your application with `@Blocking` or `@NonBlocking`, and this will set the default for every method that does not have an explicit annotation. Behaviour can still be overridden on a class or method level by annotating them directly, however all endpoints without @@ -1815,16 +1815,16 @@ an annotation will now follow the default, no matter their method signature. If your application needs to return non-nominal HTTP codes in error cases, the best is to throw exceptions that will result in the proper HTTP response being sent by the -framework using link:{jaxrsapi}/javax/ws/rs/WebApplicationException.html[`WebApplicationException`] or any of its subtypes: +framework using link:{jaxrsapi}/jakarta/ws/rs/WebApplicationException.html[`WebApplicationException`] or any of its subtypes: [source,java] ---- package org.acme.rest; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; @Path("cheeses/{cheese}") public class Endpoint { @@ -1856,12 +1856,12 @@ package org.acme.rest; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.RestResponse; @@ -1942,7 +1942,7 @@ Your exception mapper may declare any of the following parameter types: |Any of the <> | -|link:{jaxrsapi}/javax/ws/rs/container/ContainerRequestContext.html[`ContainerRequestContext`] +|link:{jaxrsapi}/jakarta/ws/rs/container/ContainerRequestContext.html[`ContainerRequestContext`] |A context object to access the current request |=== @@ -1953,7 +1953,7 @@ It may declare any of the following return types: |=== |Type|Usage -|link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestResponse.html[`RestResponse`] or link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`] +|link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestResponse.html[`RestResponse`] or link:{jaxrsapi}/jakarta/ws/rs/core/Response.html[`Response`] |The response to send to the client when the exception occurs |link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni`] or link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni`] @@ -2056,10 +2056,10 @@ Your filters may declare any of the following parameter types: |Any of the <> | -|link:{jaxrsapi}/javax/ws/rs/container/ContainerRequestContext.html[`ContainerRequestContext`] +|link:{jaxrsapi}/jakarta/ws/rs/container/ContainerRequestContext.html[`ContainerRequestContext`] |A context object to access the current request -|link:{jaxrsapi}/javax/ws/rs/container/ContainerResponseContext.html[`ContainerResponseContext`] +|link:{jaxrsapi}/jakarta/ws/rs/container/ContainerResponseContext.html[`ContainerResponseContext`] |A context object to access the current response |link:{jdkapi}/java/lang/Throwable.html[`Throwable`] @@ -2073,7 +2073,7 @@ It may declare any of the following return types: |=== |Type|Usage -|link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestResponse.html[`RestResponse`] or link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`] +|link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestResponse.html[`RestResponse`] or link:{jaxrsapi}/jakarta/ws/rs/core/Response.html[`Response`] |The response to send to the client instead of continuing the filter chain, or `null` if the filter chain should proceed |link:{jdkapi}/java/util/Optional.html[`Optional>`] or link:{jdkapi}/java/util/Optional.html[`Optional`] @@ -2084,7 +2084,7 @@ It may declare any of the following return types: |=== -NOTE: You can restrict the Resource methods for which a filter runs, by using link:{jaxrsapi}/javax/ws/rs/NameBinding.html[`@NameBinding`] meta-annotations. +NOTE: You can restrict the Resource methods for which a filter runs, by using link:{jaxrsapi}/jakarta/ws/rs/NameBinding.html[`@NameBinding`] meta-annotations. ==== The JAX-RS way @@ -2105,11 +2105,11 @@ package org.acme.rest.json; import io.vertx.core.http.HttpServerRequest; import org.jboss.logging.Logger; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; @Provider public class LoggingFilter implements ContainerRequestFilter { @@ -2150,14 +2150,14 @@ Now, whenever a REST method is invoked, the request will be logged into the cons Whenever your endpoint methods return an object (of when they return a link:{resteasy-reactive-common-api}/org/jboss/resteasy/reactive/RestResponse.html[`RestResponse`] -or link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`] with +or link:{jaxrsapi}/jakarta/ws/rs/core/Response.html[`Response`] with an entity), RESTEasy Reactive will look for a way to map that into an HTTP response body. Similarly, whenever your endpoint method takes an object as parameter, we will look for a way to map the HTTP request body into that object. -This is done via a pluggable system of link:{jaxrsapi}/javax/ws/rs/ext/MessageBodyReader.html[`MessageBodyReader`] -and link:{jaxrsapi}/javax/ws/rs/ext/MessageBodyWriter.html[`MessageBodyWriter`] interfaces, +This is done via a pluggable system of link:{jaxrsapi}/jakarta/ws/rs/ext/MessageBodyReader.html[`MessageBodyReader`] +and link:{jaxrsapi}/jakarta/ws/rs/ext/MessageBodyWriter.html[`MessageBodyWriter`] interfaces, which are responsible for defining which Java type they map from/to, for which media types, and how they turn HTTP bodies to/from Java instances of that type. @@ -2167,9 +2167,9 @@ For example, if we have our own `Cheese` type on our endpoint: ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; class Cheese { public String name; @@ -2195,7 +2195,7 @@ public class Endpoint { ---- Then we can define how to read and write it with our body reader/writers, annotated -with link:{jaxrsapi}/javax/ws/rs/ext/Provider.html[`@Provider`]: +with link:{jaxrsapi}/jakarta/ws/rs/ext/Provider.html[`@Provider`]: [source,java] ---- @@ -2208,12 +2208,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -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.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; @Provider public class CheeseBodyHandler implements MessageBodyReader, @@ -2258,7 +2258,7 @@ public class CheeseBodyHandler implements MessageBodyReader, If you want to get the most performance our of your writer, you can extend the link:{resteasy-reactive-api}/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.html[`ServerMessageBodyWriter`] -instead of link:{jaxrsapi}/javax/ws/rs/ext/MessageBodyWriter.html[`MessageBodyWriter`] +instead of link:{jaxrsapi}/jakarta/ws/rs/ext/MessageBodyWriter.html[`MessageBodyWriter`] where you will be able to use less reflection and bypass the blocking IO layer: [source,java] @@ -2272,11 +2272,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -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.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; @@ -2303,15 +2303,15 @@ public class CheeseBodyHandler implements MessageBodyReader, ---- NOTE: You can restrict which content-types your reader/writer apply to by adding -link:{jaxrsapi}/javax/ws/rs/Consumes.html[`Consumes`]/link:{jaxrsapi}/javax/ws/rs/Produces.html[`Produces`] annotations +link:{jaxrsapi}/jakarta/ws/rs/Consumes.html[`Consumes`]/link:{jaxrsapi}/jakarta/ws/rs/Produces.html[`Produces`] annotations on your provider class. === Reader and Writer interceptors Just as you can intercept requests and responses, you can also intercept readers and writers, by -extending the link:{jaxrsapi}/javax/ws/rs/ext/ReaderInterceptor.html[`ReaderInterceptor`] or -link:{jaxrsapi}/javax/ws/rs/ext/WriterInterceptor.html[`WriterInterceptor`] on a class annotated with -link:{jaxrsapi}/javax/ws/rs/ext/Provider.html[`@Provider`]. +extending the link:{jaxrsapi}/jakarta/ws/rs/ext/ReaderInterceptor.html[`ReaderInterceptor`] or +link:{jaxrsapi}/jakarta/ws/rs/ext/WriterInterceptor.html[`WriterInterceptor`] on a class annotated with +link:{jaxrsapi}/jakarta/ws/rs/ext/Provider.html[`@Provider`]. If we look at this endpoint: @@ -2319,9 +2319,9 @@ If we look at this endpoint: ---- package org.acme.rest; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; @Path("cheese") public class Endpoint { @@ -2346,12 +2346,12 @@ package org.acme.rest; import java.io.IOException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.ReaderInterceptorContext; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.ReaderInterceptorContext; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; @Provider public class CheeseIOInterceptor implements ReaderInterceptor, WriterInterceptor { @@ -2393,8 +2393,8 @@ However, you can change this default behavior and constrain a provider to: All <> can be declared as link:{jdkapi}/java/lang/String.html[`String`], but also any of the following types: -- Types for which a link:{jaxrsapi}/javax/ws/rs/ext/ParamConverter.html[`ParamConverter`] is available via a registered -link:{jaxrsapi}/javax/ws/rs/ext/ParamConverterProvider.html[`ParamConverterProvider`]. +- Types for which a link:{jaxrsapi}/jakarta/ws/rs/ext/ParamConverter.html[`ParamConverter`] is available via a registered +link:{jaxrsapi}/jakarta/ws/rs/ext/ParamConverterProvider.html[`ParamConverterProvider`]. - Primitive types. - Types that have a constructor that accepts a single link:{jdkapi}/java/lang/String.html[`String`] argument. - Types that have a static method named `valueOf` or `fromString` with a single link:{jdkapi}/java/lang/String.html[`String`] argument @@ -2413,11 +2413,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.RestQuery; @@ -2506,7 +2506,7 @@ conditions, such as: - A resource tag, similar to a hash code of the resource to designate its state or version Let's see how you can do conditional request validation using the -link:{jaxrsapi}/javax/ws/rs/core/Request.html[`Request`] context object: +link:{jaxrsapi}/jakarta/ws/rs/core/Request.html[`Request`] context object: [source,java] ---- @@ -2517,13 +2517,13 @@ import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalUnit; import java.util.Date; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; @Path("conditional") public class Endpoint { @@ -2637,12 +2637,12 @@ The following endpoint supports serving cheese in plain text or JSON: ---- package org.acme.rest; -import javax.ws.rs.Consumes; -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.ws.rs.Consumes; +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 com.fasterxml.jackson.annotation.JsonCreator; diff --git a/docs/src/main/asciidoc/resteasy.adoc b/docs/src/main/asciidoc/resteasy.adoc index 6a439993512d1..07bb3bcf1dc3c 100644 --- a/docs/src/main/asciidoc/resteasy.adoc +++ b/docs/src/main/asciidoc/resteasy.adoc @@ -116,10 +116,10 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Set; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/fruits") public class FruitResource { @@ -197,7 +197,7 @@ An example where a custom module needs to be registered would look like so: ---- import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.jackson.ObjectMapperCustomizer; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class RegisterCustomModuleCustomizer implements ObjectMapperCustomizer { @@ -218,7 +218,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.arc.All; import io.quarkus.jackson.ObjectMapperCustomizer; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; public class CustomObjectMapper { @@ -248,9 +248,9 @@ If for example a custom serializer named `FooSerializer` for type `com.example.F [source,java] ---- import io.quarkus.jsonb.JsonbConfigCustomizer; -import javax.inject.Singleton; -import javax.json.bind.JsonbConfig; -import javax.json.bind.serializer.JsonbSerializer; +import jakarta.inject.Singleton; +import jakarta.json.bind.JsonbConfig; +import jakarta.json.bind.serializer.JsonbSerializer; @Singleton public class FooSerializerRegistrationCustomizer implements JsonbConfigCustomizer { @@ -261,17 +261,17 @@ public class FooSerializerRegistrationCustomizer implements JsonbConfigCustomize } ---- -A more advanced option would be to directly provide a bean of `javax.json.bind.JsonbConfig` (with a `Dependent` scope) or in the extreme case to provide a bean of type `javax.json.bind.Jsonb` (with a `Singleton` scope). -If the latter approach is leveraged it is very important to manually inject and apply all `io.quarkus.jsonb.JsonbConfigCustomizer` beans in the CDI producer that produces `javax.json.bind.Jsonb`. +A more advanced option would be to directly provide a bean of `jakarta.json.bind.JsonbConfig` (with a `Dependent` scope) or in the extreme case to provide a bean of type `jakarta.json.bind.Jsonb` (with a `Singleton` scope). +If the latter approach is leveraged it is very important to manually inject and apply all `io.quarkus.jsonb.JsonbConfigCustomizer` beans in the CDI producer that produces `jakarta.json.bind.Jsonb`. Failure to do so will prevent JSON-B specific customizations provided by various extensions from being applied. [source,java] ---- import io.quarkus.jsonb.JsonbConfigCustomizer; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.json.bind.JsonbConfig; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.json.bind.JsonbConfig; public class CustomJsonbConfig { @@ -502,12 +502,12 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; -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 javax.ws.rs.core.Response; +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 jakarta.ws.rs.core.Response; @Path("/legumes") @Produces(MediaType.APPLICATION_JSON) @@ -656,11 +656,11 @@ package org.acme.rest.json; import io.vertx.core.http.HttpServerRequest; import org.jboss.logging.Logger; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; @Provider public class LoggingFilter implements ContainerRequestFilter { @@ -773,7 +773,7 @@ If multiple JAX-RS applications are defined, the property `quarkus.resteasy.igno === Support limitations of JAX-RS application -The RESTEasy extension doesn't support the method `getProperties()` of the class `javax.ws.rs.core.Application`. Moreover, it only relies on the methods `getClasses()` and `getSingletons()` to filter out the annotated resource, provider and feature classes. +The RESTEasy extension doesn't support the method `getProperties()` of the class `jakarta.ws.rs.core.Application`. Moreover, it only relies on the methods `getClasses()` and `getSingletons()` to filter out the annotated resource, provider and feature classes. It doesn't filter out the built-in resource, provider and feature classes and also the resource, provider and feature classes registered by the other extensions. Finally, the objects returned by the method `getSingletons()` are ignored, only the classes are taken into account to filter out the resource, provider and feature classes, in other words the method `getSingletons()` is actually managed the same way as `getClasses()`. @@ -784,7 +784,7 @@ It's possible to inject other beans via `@Inject`, bind interceptors using bindi If there is no scope annotation declared on the resource class then the scope is defaulted. The default scope can be controlled through the `quarkus.resteasy.singleton-resources` property. -If set to `true` (default) then a *single instance* of a resource class is created to service all requests (as defined by `@javax.inject.Singleton`). +If set to `true` (default) then a *single instance* of a resource class is created to service all requests (as defined by `@jakarta.inject.Singleton`). If set to `false` then a *new instance* of the resource class is created per each request. An explicit CDI scope annotation (`@RequestScoped`, `@ApplicationScoped`, etc.) always overrides the default behavior and specifies the lifecycle of resource instances. diff --git a/docs/src/main/asciidoc/scheduler-reference.adoc b/docs/src/main/asciidoc/scheduler-reference.adoc index ba28c9bf9a524..fad3e54d8f0e0 100644 --- a/docs/src/main/asciidoc/scheduler-reference.adoc +++ b/docs/src/main/asciidoc/scheduler-reference.adoc @@ -24,7 +24,7 @@ NOTE: If you add the `quarkus-quartz` dependency to your project the lightweight A method annotated with `@io.quarkus.scheduler.Scheduled` is automatically scheduled for invocation. A scheduled method must not be abstract or private. It may be either static or non-static. -A scheduled method can be annotated with interceptor bindings, such as `@javax.transaction.Transactional` and `@org.eclipse.microprofile.metrics.annotation.Counted`. +A scheduled method can be annotated with interceptor bindings, such as `@jakarta.transaction.Transactional` and `@org.eclipse.microprofile.metrics.annotation.Counted`. NOTE: If there is a bean class that has no scope and declares at least one non-static method annotated with `@Scheduled` then `@Singleton` is used. diff --git a/docs/src/main/asciidoc/scheduler.adoc b/docs/src/main/asciidoc/scheduler.adoc index bf9cb8b4526eb..1eb6cb7734565 100644 --- a/docs/src/main/asciidoc/scheduler.adoc +++ b/docs/src/main/asciidoc/scheduler.adoc @@ -82,7 +82,7 @@ In the `org.acme.scheduler` package, create the `CounterBean` class, with the fo package org.acme.scheduler; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.scheduler.Scheduled; import io.quarkus.scheduler.ScheduledExecution; @@ -141,11 +141,11 @@ Create the `CountResource` class as follows: ---- package org.acme.scheduler; -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("/count") public class CountResource { diff --git a/docs/src/main/asciidoc/scripting.adoc b/docs/src/main/asciidoc/scripting.adoc index 923157b4cb038..be46030a02ddd 100644 --- a/docs/src/main/asciidoc/scripting.adoc +++ b/docs/src/main/asciidoc/scripting.adoc @@ -36,12 +36,12 @@ Normally we would link to a Git repository to clone but in this case there is no //JAVA_OPTIONS -Djava.util.logging.manager=org.jboss.logmanager.LogManager import io.quarkus.runtime.Quarkus; -import javax.enterprise.context.ApplicationScoped; -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.enterprise.context.ApplicationScoped; +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; @Path("/hello") @@ -165,9 +165,9 @@ Now let us replace the class with one that uses Quarkus features: [source,java] ---- import io.quarkus.runtime.Quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello") @ApplicationScoped @@ -284,12 +284,12 @@ Edit the `quarksapp` class to inject the `GreetingService` and create a new endp //DEPS io.quarkus:quarkus-resteasy-reactive:{quarkus-version} import io.quarkus.runtime.Quarkus; -import javax.enterprise.context.ApplicationScoped; -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.enterprise.context.ApplicationScoped; +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("/hello") @ApplicationScoped diff --git a/docs/src/main/asciidoc/security-authorize-web-endpoints-reference.adoc b/docs/src/main/asciidoc/security-authorize-web-endpoints-reference.adoc index 8720c9e4aca12..099f6b43f5337 100644 --- a/docs/src/main/asciidoc/security-authorize-web-endpoints-reference.adoc +++ b/docs/src/main/asciidoc/security-authorize-web-endpoints-reference.adoc @@ -256,13 +256,13 @@ As an equivalent to `@RolesAllowed("**")`, {project-name} also provides the `io. ---- import java.security.Principal; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -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.DenyAll; +import jakarta.annotation.security.PermitAll; +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("subject") public class SubjectExposingResource { @@ -332,13 +332,13 @@ tester.role=Tester ---- import java.security.Principal; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -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.DenyAll; +import jakarta.annotation.security.PermitAll; +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("subject") public class SubjectExposingResource { diff --git a/docs/src/main/asciidoc/security-basic-authentication-tutorial.adoc b/docs/src/main/asciidoc/security-basic-authentication-tutorial.adoc index 2829879a2fae8..4dd0af56d87a3 100644 --- a/docs/src/main/asciidoc/security-basic-authentication-tutorial.adoc +++ b/docs/src/main/asciidoc/security-basic-authentication-tutorial.adoc @@ -88,11 +88,11 @@ Add a regular JAX-RS resource to your Java source code, as outlined in the follo ---- package org.acme.security.jpa; -import javax.annotation.security.PermitAll; -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.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/api/public") public class PublicResource { @@ -112,11 +112,11 @@ Add a JAX-RS resource with the following `@RolesAllowed` annotation: ---- package org.acme.security.jpa; -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("/api/admin") public class AdminResource { @@ -136,12 +136,12 @@ We are also using `SecurityContext` to get access to the currently authenticated ---- package org.acme.security.jpa; -import javax.annotation.security.RolesAllowed; -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.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/api/users") public class UserResource { @@ -163,8 +163,8 @@ You can now describe how you want security information to be stored in the model ---- package org.acme.security.jpa; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.quarkus.hibernate.orm.panache.PanacheEntity; import io.quarkus.elytron.security.common.BcryptUtil; @@ -247,9 +247,9 @@ This approach is suitable for development but needs to be revised for production ---- package org.acme.security.jpa; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; -import javax.transaction.Transactional; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; +import jakarta.transaction.Transactional; import io.quarkus.runtime.StartupEvent; diff --git a/docs/src/main/asciidoc/security-csrf-prevention.adoc b/docs/src/main/asciidoc/security-csrf-prevention.adoc index 8ab6b30b7561c..73108c1104878 100644 --- a/docs/src/main/asciidoc/security-csrf-prevention.adoc +++ b/docs/src/main/asciidoc/security-csrf-prevention.adoc @@ -75,14 +75,14 @@ Now let's create a resource class which returns an HTML form and handles form PO ---- package io.quarkus.it.csrf; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.FormParam; +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.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; @@ -140,15 +140,15 @@ Your JAX-RS endpoint may accept not only HTTP POST requests with `application/x- ---- package io.quarkus.it.csrf; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +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.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; @@ -227,16 +227,16 @@ If you prefer to compare the CSRF form field and cookie values in the applicatio ---- package io.quarkus.it.csrf; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -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.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +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.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; diff --git a/docs/src/main/asciidoc/security-customization.adoc b/docs/src/main/asciidoc/security-customization.adoc index 2c3fc782a2717..3453662758a11 100644 --- a/docs/src/main/asciidoc/security-customization.adoc +++ b/docs/src/main/asciidoc/security-customization.adoc @@ -146,7 +146,7 @@ import io.quarkus.security.identity.SecurityIdentityAugmentor; import io.quarkus.security.runtime.QuarkusSecurityIdentity; import io.smallrye.mutiny.Uni; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.function.Supplier; @ApplicationScoped @@ -187,7 +187,7 @@ import io.quarkus.security.identity.SecurityIdentityAugmentor; import io.quarkus.security.runtime.QuarkusSecurityIdentity; import io.smallrye.mutiny.Uni; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.function.Supplier; import java.util.Set; @@ -232,7 +232,7 @@ You can enforce the order by implementing a default `SecurityIdentityAugmentor#p ==== By default, the request context is not activated when augmenting the security identity, this means that if you want to use for example Hibernate -that mandates a request context, you will have a `javax.enterprise.context.ContextNotActiveException`. +that mandates a request context, you will have a `jakarta.enterprise.context.ContextNotActiveException`. The solution is to activate the request context, the following example shows how to get the roles from an Hibernate with Panache `UserRoleEntity`. @@ -243,9 +243,9 @@ import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.identity.SecurityIdentityAugmentor; import io.smallrye.mutiny.Uni; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class RolesAugmentor implements SecurityIdentityAugmentor { @@ -272,8 +272,8 @@ public class RolesAugmentor implements SecurityIdentityAugmentor { import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.runtime.QuarkusSecurityIdentity; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; import java.util.function.Supplier; @Dependent @@ -309,11 +309,11 @@ If you use JAX-RS `ContainerRequestFilter` to set a custom JAX-RS `SecurityConte ---- import java.security.Principal; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; @Provider @PreMatching diff --git a/docs/src/main/asciidoc/security-jdbc.adoc b/docs/src/main/asciidoc/security-jdbc.adoc index b0efe9bc01701..541cddf7c603f 100644 --- a/docs/src/main/asciidoc/security-jdbc.adoc +++ b/docs/src/main/asciidoc/security-jdbc.adoc @@ -83,11 +83,11 @@ Let's start by implementing the `/api/public` endpoint. As you can see from the ---- package org.acme.security.jdbc; -import javax.annotation.security.PermitAll; -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.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/api/public") public class PublicResource { @@ -108,11 +108,11 @@ The source code for the `/api/admin` endpoint is also very simple. The main diff ---- package org.acme.security.jdbc; -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("/api/admin") public class AdminResource { @@ -133,12 +133,12 @@ We are using `SecurityContext` to get access to the current authenticated Princi ---- package org.acme.security.jdbc; -import javax.annotation.security.RolesAllowed; -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.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/api/users") public class UserResource { diff --git a/docs/src/main/asciidoc/security-jwt-build.adoc b/docs/src/main/asciidoc/security-jwt-build.adoc index fd6986be93465..0d63ece610023 100644 --- a/docs/src/main/asciidoc/security-jwt-build.adoc +++ b/docs/src/main/asciidoc/security-jwt-build.adoc @@ -44,8 +44,8 @@ The first step is to initialize a `JwtClaimsBuilder` using one of the options be [source, java] ---- import java.util.Collections; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import io.smallrye.jwt.build.Jwt; import io.smallrye.jwt.build.JwtClaimsBuilder; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/docs/src/main/asciidoc/security-jwt.adoc b/docs/src/main/asciidoc/security-jwt.adoc index d523d030bb6d7..cbc7c22e3d2c7 100644 --- a/docs/src/main/asciidoc/security-jwt.adoc +++ b/docs/src/main/asciidoc/security-jwt.adoc @@ -81,16 +81,16 @@ package org.acme.security.jwt; import java.security.Principal; -import javax.annotation.security.PermitAll; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -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.annotation.security.PermitAll; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +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; import org.eclipse.microprofile.jwt.JsonWebToken; @@ -186,17 +186,17 @@ So now let's actually secure something. Take a look at the new endpoint method ` ---- package org.acme.security.jwt; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -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.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +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; import org.eclipse.microprofile.jwt.JsonWebToken; @@ -457,7 +457,7 @@ Success! We now have: Now that we can generate a JWT to access our secured REST endpoints, let's see what more we can do with the `JsonWebToken` interface and the JWT claims. The `org.eclipse.microprofile.jwt.JsonWebToken` interface extends the `java.security.Principal` -interface, and is in fact the type of the object that is returned by the `javax.ws.rs.core.SecurityContext#getUserPrincipal()` call we +interface, and is in fact the type of the object that is returned by the `jakarta.ws.rs.core.SecurityContext#getUserPrincipal()` call we used previously. This means that code that does not use CDI but does have access to the REST container `SecurityContext` can get hold of the caller `JsonWebToken` interface by casting the `SecurityContext#getUserPrincipal()`. @@ -471,17 +471,17 @@ All the JWT claims can also be injected. Let's expand our `TokenSecuredResource` ---- package org.acme.security.jwt; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -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.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +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; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; @@ -624,7 +624,7 @@ However, `@RequestScoped` must be used when the individual token claims are inje ---- package org.acme.security.jwt; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; @@ -700,9 +700,9 @@ You can also use it to customize the way the token is verified or decrypted. For [source,java] ---- import javax.crypto.SecretKey; -import javax.ws.rs.GET; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.jwt.JsonWebToken; import io.smallrye.jwt.auth.principal.JWTParser; import io.smallrye.jwt.build.Jwt; @@ -756,9 +756,9 @@ If you need to provide your own factory, for example, to avoid verifying the tok ---- import java.nio.charset.StandardCharsets; import java.util.Base64; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import org.jose4j.jwt.JwtClaims; import org.jose4j.jwt.consumer.InvalidJwtException; import io.smallrye.jwt.auth.principal.DefaultJWTCallerPrincipal; diff --git a/docs/src/main/asciidoc/security-keycloak-admin-client.adoc b/docs/src/main/asciidoc/security-keycloak-admin-client.adoc index c0f59f3104897..066ab69960068 100644 --- a/docs/src/main/asciidoc/security-keycloak-admin-client.adoc +++ b/docs/src/main/asciidoc/security-keycloak-admin-client.adoc @@ -67,9 +67,9 @@ package org.acme.keycloak.admin.client; import org.keycloak.admin.client.Keycloak; import org.keycloak.representations.idm.RoleRepresentation; -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 java.util.List; @Path("/api/admin") @@ -121,10 +121,10 @@ import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.representations.idm.RoleRepresentation; -import javax.annotations.PostConstruct; -import javax.annotations.PreConstruct; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotations.PostConstruct; +import jakarta.annotations.PreConstruct; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.List; @Path("/api/admin") diff --git a/docs/src/main/asciidoc/security-keycloak-authorization.adoc b/docs/src/main/asciidoc/security-keycloak-authorization.adoc index 003588d8892c1..77a43c25733af 100644 --- a/docs/src/main/asciidoc/security-keycloak-authorization.adoc +++ b/docs/src/main/asciidoc/security-keycloak-authorization.adoc @@ -105,9 +105,9 @@ As you can see from the source code below it is just a regular JAX-RS resource: ---- package org.acme.security.keycloak.authorization; -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 org.jboss.resteasy.annotations.cache.NoCache; @@ -147,10 +147,10 @@ The source code for the `/api/admin` endpoint is also very simple: ---- package org.acme.security.keycloak.authorization; -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.security.Authenticated; diff --git a/docs/src/main/asciidoc/security-ldap.adoc b/docs/src/main/asciidoc/security-ldap.adoc index 1644ff9262e71..abc5e47d40153 100644 --- a/docs/src/main/asciidoc/security-ldap.adoc +++ b/docs/src/main/asciidoc/security-ldap.adoc @@ -81,11 +81,11 @@ Let's start by implementing the `/api/public` endpoint. As you can see from the ---- package org.acme.elytron.security.ldap; -import javax.annotation.security.PermitAll; -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.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/api/public") public class PublicResource { @@ -106,11 +106,11 @@ The source code for the `/api/admin` endpoint is also very simple. The main diff ---- package org.acme.elytron.security.ldap; -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("/api/admin") public class AdminResource { @@ -131,12 +131,12 @@ We are using `SecurityContext` to get access to the current authenticated Princi ---- package org.acme.elytron.security.ldap; -import javax.annotation.security.RolesAllowed; -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.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("/api/users") public class UserResource { diff --git a/docs/src/main/asciidoc/security-oauth2.adoc b/docs/src/main/asciidoc/security-oauth2.adoc index 74e2f6ba85593..9604fa770433c 100644 --- a/docs/src/main/asciidoc/security-oauth2.adoc +++ b/docs/src/main/asciidoc/security-oauth2.adoc @@ -66,10 +66,10 @@ Create the `src/main/java/org/acme/security/oauth2/TokenSecuredResource.java` fi ---- package org.acme.security.oauth2; -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("/secured") public class TokenSecuredResource { @@ -92,14 +92,14 @@ package org.acme.security.oauth2; import java.security.Principal; -import javax.annotation.security.PermitAll; -import javax.inject.Inject; -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.annotation.security.PermitAll; +import jakarta.inject.Inject; +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("/secured") @ApplicationScoped @@ -170,15 +170,15 @@ package org.acme.security.oauth2; import java.security.Principal; -import javax.annotation.security.PermitAll; -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.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.PermitAll; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; @Path("/secured") @ApplicationScoped diff --git a/docs/src/main/asciidoc/security-oidc-bearer-authentication-concept.adoc b/docs/src/main/asciidoc/security-oidc-bearer-authentication-concept.adoc index ca9d49d71748e..d7b691799709d 100644 --- a/docs/src/main/asciidoc/security-oidc-bearer-authentication-concept.adoc +++ b/docs/src/main/asciidoc/security-oidc-bearer-authentication-concept.adoc @@ -52,12 +52,12 @@ If you need to access JWT token claims then you can inject `JsonWebToken`: package org.acme.security.openid.connect; import org.eclipse.microprofile.jwt.JsonWebToken; -import javax.inject.Inject; -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.inject.Inject; +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("/api/admin") public class AdminResource { @@ -80,7 +80,7 @@ Injection of `JsonWebToken` is supported in `@ApplicationScoped`, `@Singleton` a === User Info Set `quarkus.oidc.authentication.user-info-required=true` if a UserInfo JSON object from the OIDC userinfo endpoint has to be requested. -A request will be sent to the OpenID Provider UserInfo endpoint and an `io.quarkus.oidc.UserInfo` (a simple `javax.json.JsonObject` wrapper) object will be created. +A request will be sent to the OpenID Provider UserInfo endpoint and an `io.quarkus.oidc.UserInfo` (a simple `jakarta.json.JsonObject` wrapper) object will be created. `io.quarkus.oidc.UserInfo` can be either injected or accessed as a SecurityIdentity `userinfo` attribute. [[config-metadata]] @@ -145,7 +145,7 @@ quarkus.oidc.token.require-jwt-introspection-only=true An advantage of this approach is that the configuration is simple and easy to understand, while its disavantage is that a remote OIDC metadata discovery call is required to discover an introspection endpoint address (though the verification keys will also not be fetched). -Note that `io.quarkus.oidc.TokenIntrospection` (a simple `javax.json.JsonObject` wrapper) object will be created and can be either injected or accessed as a SecurityIdentity `introspection` attribute if either JWT or opaque token has been successfully introspected. +Note that `io.quarkus.oidc.TokenIntrospection` (a simple `jakarta.json.JsonObject` wrapper) object will be created and can be either injected or accessed as a SecurityIdentity `introspection` attribute if either JWT or opaque token has been successfully introspected. [[token-introspection-userinfo-cache]] === Token Introspection and UserInfo Cache @@ -204,10 +204,10 @@ In such cases you may want to consider skipping the issuer verification by setti [source, java] ---- -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.jwt.JsonWebToken; import io.quarkus.oidc.OidcConfigurationMetadata; diff --git a/docs/src/main/asciidoc/security-oidc-code-flow-authentication-concept.adoc b/docs/src/main/asciidoc/security-oidc-code-flow-authentication-concept.adoc index abce2de972bf7..12d8b107a5452 100644 --- a/docs/src/main/asciidoc/security-oidc-code-flow-authentication-concept.adoc +++ b/docs/src/main/asciidoc/security-oidc-code-flow-authentication-concept.adoc @@ -53,7 +53,7 @@ One can access ID Token claims by injecting `JsonWebToken` with an `IdToken` qua [source, java] ---- -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.JsonWebToken; import io.quarkus.oidc.IdToken; import io.quarkus.security.Authenticated; @@ -77,7 +77,7 @@ Access Token is usually used by the OIDC `web-app` application to access other e [source, java] ---- -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.JsonWebToken; import io.quarkus.oidc.AccessTokenCredential; import io.quarkus.security.Authenticated; @@ -116,7 +116,7 @@ RefreshToken is only used to refresh the current ID and access tokens as part of If the ID token does not provide enough information about the currently-authenticated user, then you can set a `quarkus.oidc.authentication.user-info-required=true` property for a https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo] JSON object from the OIDC userinfo endpoint to be requested. -A request will be sent to the OpenID Provider UserInfo endpoint using the access token returned with the authorization code grant response and an `io.quarkus.oidc.UserInfo` (a simple `javax.json.JsonObject` wrapper) object will be created. `io.quarkus.oidc.UserInfo` can be either injected or accessed as a SecurityIdentity `userinfo` attribute. +A request will be sent to the OpenID Provider UserInfo endpoint using the access token returned with the authorization code grant response and an `io.quarkus.oidc.UserInfo` (a simple `jakarta.json.JsonObject` wrapper) object will be created. `io.quarkus.oidc.UserInfo` can be either injected or accessed as a SecurityIdentity `userinfo` attribute. [[config-metadata]] === Configuration metadata @@ -313,9 +313,9 @@ If you work with a social provider such as Google and are concerned that the use [source,java] ---- -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.OidcSession; @@ -394,8 +394,8 @@ Here is a simple example: ---- package io.quarkus.oidc.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.arc.AlternativePriority; import io.quarkus.oidc.AuthorizationCodeTokens; @@ -465,8 +465,8 @@ One can register `@ApplicationScoped` bean which will observe important OIDC aut [source, java] ---- -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.oidc.IdTokenCredential; import io.quarkus.oidc.SecurityEvent; @@ -565,10 +565,10 @@ This is all what is needed for an endpoint like this one to return the currently [source,java] ---- -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.oidc.UserInfo; import io.quarkus.security.Authenticated; @@ -597,7 +597,7 @@ package io.quarkus.it.keycloak; import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.UserInfo; import io.quarkus.security.identity.AuthenticationRequestContext; @@ -636,10 +636,10 @@ Now, the following code will work when the user is signing in into your applicat [source,java] ---- -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.security.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc b/docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc index f56876df5d88c..296812d78163d 100644 --- a/docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc +++ b/docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc @@ -70,10 +70,10 @@ Let's write a simple JAX-RS resource which has all the tokens returned in the au ---- package org.acme.security.openid.connect.web.authentication; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc b/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc index e246378d6217b..7ddee6eaa0bdb 100644 --- a/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc @@ -148,9 +148,9 @@ One can use `OidcClient` directly as follows: [source,java] ---- -import javax.inject.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; +import jakarta.inject.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; import io.quarkus.oidc.client.OidcClient; import io.quarkus.oidc.client.Tokens; @@ -188,9 +188,9 @@ You can inject `Tokens` which uses `OidcClient` internally. `Tokens` can be used [source,java] ---- -import javax.inject.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; +import jakarta.inject.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; import io.quarkus.oidc.client.Tokens; @@ -226,9 +226,9 @@ Note in this case the default client is disabled with a `client-enabled=false` p [source,java] ---- -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; @@ -253,9 +253,9 @@ If you also use xref:security-openid-connect-multitenancy.adoc[OIDC multitenancy [source,java] ---- -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; @@ -284,9 +284,9 @@ If you need you can also create new `OidcClient` programmatically like this: [source,java] ---- -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; @@ -322,9 +322,9 @@ In case of multiple configured ``OidcClient``s you can specify the `OidcClient` ---- package io.quarkus.oidc.client; -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("/clients") public class OidcClientResource { @@ -936,7 +936,7 @@ quarkus.oidc-token-propagation-reactive.exchange-token=true [[token-propagation]] == Token Propagation -The `quarkus-oidc-token-propagation` extension provides two JAX-RS `javax.ws.rs.client.ClientRequestFilter` class implementations that simplify the propagation of authentication information. +The `quarkus-oidc-token-propagation` extension provides two JAX-RS `jakarta.ws.rs.client.ClientRequestFilter` class implementations that simplify the propagation of authentication information. `io.quarkus.oidc.token.propagation.AccessTokenRequestFilter` propagates the xref:security-oidc-bearer-authentication-concept.adoc[Bearer token] present in the current active request or the token acquired from the xref:security-oidc-code-flow-authentication-concept.adoc[Authorization code flow mechanism], as the HTTP `Authorization` header's `Bearer` scheme value. The `io.quarkus.oidc.token.propagation.JsonWebTokenRequestFilter` provides the same functionality, but in addition provides support for JWT tokens. diff --git a/docs/src/main/asciidoc/security-openid-connect-client.adoc b/docs/src/main/asciidoc/security-openid-connect-client.adoc index ebe5be51ea46f..24ffbe3c5f444 100644 --- a/docs/src/main/asciidoc/security-openid-connect-client.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-client.adoc @@ -101,11 +101,11 @@ Let's start by implementing `ProtectedResource`: ---- package org.acme.security.openid.connect.client; -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 jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.security.Authenticated; import io.smallrye.mutiny.Uni; @@ -145,9 +145,9 @@ Next let's add a REST Client with `OidcClientRequestReactiveFilter` and another ---- package org.acme.security.openid.connect.client; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @@ -178,9 +178,9 @@ where `RestClientWithOidcClientFilter` will depend on `OidcClientRequestReactive ---- package org.acme.security.openid.connect.client; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; @@ -215,10 +215,10 @@ Now let's complete creating the application with adding `FrontendResource`: ---- package org.acme.security.openid.connect.client; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RestClient; @@ -272,9 +272,9 @@ Finally, let's add a JAX-RS `ExceptionMapper`: ---- package org.acme.security.openid.connect.client; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.ClientWebApplicationException; diff --git a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc index 1699e3e2f59b7..62614000eae20 100644 --- a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc @@ -85,10 +85,10 @@ Let's start by implementing the `/{tenant}` endpoint. As you can see from the so ---- package org.acme.quickstart.oidc; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.jwt.JsonWebToken; @@ -155,7 +155,7 @@ In order to resolve the tenant from incoming requests and map it to a specific ` ---- package org.acme.quickstart.oidc; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.ConfigProvider; @@ -242,7 +242,7 @@ and use a custom `TenantConfigResolver` to resolve it: ---- package org.acme.quickstart.oidc; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; @@ -278,7 +278,7 @@ Therefore, when working with multiple OpenID Connect Providers, you only need a ---- package org.acme.quickstart.oidc; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; @@ -633,7 +633,7 @@ This interface allows you to dynamically create tenant configurations at runtime ---- package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.function.Supplier; import io.smallrye.mutiny.Uni; @@ -709,7 +709,7 @@ package org.acme.quickstart.oidc; import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.core.http.Cookie; diff --git a/docs/src/main/asciidoc/security-overview-concept.adoc b/docs/src/main/asciidoc/security-overview-concept.adoc index c73fb97653405..02c54e5b6f32f 100644 --- a/docs/src/main/asciidoc/security-overview-concept.adoc +++ b/docs/src/main/asciidoc/security-overview-concept.adoc @@ -73,10 +73,10 @@ For more information, see xref:resteasy-reactive.adoc#secure-serialization[Writi === Secure auto-generated resources by REST Data with Panache -If you're using the REST Data with Panache extension to auto-generate your resources, you can still use the Security annotations within the package `javax.annotation.security`. +If you're using the REST Data with Panache extension to auto-generate your resources, you can still use the Security annotations within the package `jakarta.annotation.security`. For more information, see xref:rest-data-panache.adoc#securing-endpoints[Securing auto-generated resources]. == Security vulnerability detection Most of the Quarkus tags are reported in the US link:https://nvd.nist.gov[National Vulnerability Database (NVD)]. -For information about security vulnerabilities, see xref:security-vulnerability-detection-concept.adoc[Security vulnerability detection and reporting in Quarkus]. \ No newline at end of file +For information about security vulnerabilities, see xref:security-vulnerability-detection-concept.adoc[Security vulnerability detection and reporting in Quarkus]. diff --git a/docs/src/main/asciidoc/security-proactive-authentication-concept.adoc b/docs/src/main/asciidoc/security-proactive-authentication-concept.adoc index 4ccb8a45d1a94..fcadf0b406f33 100644 --- a/docs/src/main/asciidoc/security-proactive-authentication-concept.adoc +++ b/docs/src/main/asciidoc/security-proactive-authentication-concept.adoc @@ -45,10 +45,10 @@ There is more than one way to fix the example: [source,java] ---- -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.smallrye.mutiny.Uni; @@ -69,8 +69,8 @@ public class HelloResource { [source,java] ---- -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class HelloService { @@ -91,11 +91,11 @@ You can use JAX-RS `ExceptionMapper` to capture Quarkus Security authentication ---- package io.quarkus.it.keycloak; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.quarkus.security.AuthenticationFailedException; @@ -123,8 +123,8 @@ You will then only need to customize the response, as outlined in the following ---- package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.security.AuthenticationFailedException; import io.vertx.core.Handler; diff --git a/docs/src/main/asciidoc/security-protect-service-application-using-oidc-bearer-authentication-tutorial.adoc b/docs/src/main/asciidoc/security-protect-service-application-using-oidc-bearer-authentication-tutorial.adoc index 328f509eafd16..3a5fb499b6115 100644 --- a/docs/src/main/asciidoc/security-protect-service-application-using-oidc-bearer-authentication-tutorial.adoc +++ b/docs/src/main/asciidoc/security-protect-service-application-using-oidc-bearer-authentication-tutorial.adoc @@ -88,10 +88,10 @@ Let's start by implementing the `/api/users/me` endpoint. As you can see from th ---- package org.acme.security.openid.connect; -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 org.jboss.resteasy.reactive.NoCache; import io.quarkus.security.identity.SecurityIdentity; @@ -131,11 +131,11 @@ The source code for the `/api/admin` endpoint is also very simple. The main diff ---- package org.acme.security.openid.connect; -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("/api/admin") public class AdminResource { diff --git a/docs/src/main/asciidoc/security-webauthn-concept.adoc b/docs/src/main/asciidoc/security-webauthn-concept.adoc index 606cd1dab998f..d2af30144d5bc 100644 --- a/docs/src/main/asciidoc/security-webauthn-concept.adoc +++ b/docs/src/main/asciidoc/security-webauthn-concept.adoc @@ -132,12 +132,12 @@ package org.acme.security.webauthn; import java.security.Principal; -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("/api/public") public class PublicResource { @@ -165,11 +165,11 @@ The source code for the `/api/admin` endpoint is also very simple. The main diff ---- package org.acme.security.webauthn; -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("/api/admin") public class AdminResource { @@ -190,11 +190,11 @@ We are using `SecurityContext` to get access to the current authenticated Princi ---- package org.acme.security.webauthn; -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("/api/users") public class UserResource { @@ -221,11 +221,11 @@ package org.acme.security.webauthn; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import io.quarkus.hibernate.reactive.panache.PanacheEntity; import io.smallrye.mutiny.Uni; @@ -337,8 +337,8 @@ We also need a second entity for the credentials: ---- package org.acme.security.webauthn; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import io.quarkus.hibernate.reactive.panache.PanacheEntity; @@ -362,10 +362,10 @@ And last but not least, our user entity: ---- package org.acme.security.webauthn; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import io.quarkus.hibernate.reactive.panache.PanacheEntity; import io.smallrye.mutiny.Uni; @@ -416,7 +416,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.common.runtime.ReactiveTransactional; import io.quarkus.security.webauthn.WebAuthnUserProvider; @@ -934,13 +934,13 @@ package org.acme.security.webauthn; import java.net.URI; -import javax.inject.Inject; -import javax.ws.rs.BeanParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.inject.Inject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.reactive.RestForm; @@ -1277,7 +1277,7 @@ manually, we need to override the `WebAuthnUserProvider` with one that doesn't u ---- package org.acme.security.webauthn.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.acme.security.webauthn.MyWebAuthnSetup; diff --git a/docs/src/main/asciidoc/smallrye-fault-tolerance.adoc b/docs/src/main/asciidoc/smallrye-fault-tolerance.adoc index 89ac22f169bd5..c4660e2dd5fff 100644 --- a/docs/src/main/asciidoc/smallrye-fault-tolerance.adoc +++ b/docs/src/main/asciidoc/smallrye-fault-tolerance.adoc @@ -113,7 +113,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CoffeeRepositoryService { @@ -155,9 +155,9 @@ package org.acme.microprofile.faulttolerance; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; -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 org.jboss.logging.Logger; diff --git a/docs/src/main/asciidoc/smallrye-graphql-client.adoc b/docs/src/main/asciidoc/smallrye-graphql-client.adoc index 6bafc2ea51b8f..75e7fe81beaa0 100644 --- a/docs/src/main/asciidoc/smallrye-graphql-client.adoc +++ b/docs/src/main/asciidoc/smallrye-graphql-client.adoc @@ -34,7 +34,7 @@ Any input and output objects for the operation will be translated to/from their in the GraphQL query language. The *dynamic* client, on the other hand, works rather like an equivalent of the JAX-RS client -from the `javax.ws.rs.client` package. It does not require the domain classes to work, it works with +from the `jakarta.ws.rs.client` package. It does not require the domain classes to work, it works with abstract representations of GraphQL documents instead. Documents are built using a domain-specific language (DSL). The exchanged objects are treated as an abstract `JsonObject`, but, when necessary, it is possible to convert them to concrete model objects (if suitable model classes are available). diff --git a/docs/src/main/asciidoc/smallrye-health.adoc b/docs/src/main/asciidoc/smallrye-health.adoc index a0e0039e69fc5..55bab4d8c1b74 100644 --- a/docs/src/main/asciidoc/smallrye-health.adoc +++ b/docs/src/main/asciidoc/smallrye-health.adoc @@ -114,7 +114,7 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped <1> <2> @@ -168,7 +168,7 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Readiness @ApplicationScoped @@ -213,7 +213,7 @@ import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Startup; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Startup @ApplicationScoped @@ -247,7 +247,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.HealthCheckResponseBuilder; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Readiness @ApplicationScoped @@ -316,7 +316,7 @@ import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped @@ -374,7 +374,7 @@ import io.smallrye.health.api.AsyncHealthCheck; import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.HealthCheckResponse; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped diff --git a/docs/src/main/asciidoc/smallrye-metrics.adoc b/docs/src/main/asciidoc/smallrye-metrics.adoc index 442c69bf7b9c5..f1874e40b926c 100644 --- a/docs/src/main/asciidoc/smallrye-metrics.adoc +++ b/docs/src/main/asciidoc/smallrye-metrics.adoc @@ -101,10 +101,10 @@ import org.eclipse.microprofile.metrics.annotation.Counted; import org.eclipse.microprofile.metrics.annotation.Gauge; import org.eclipse.microprofile.metrics.annotation.Timed; -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("/") public class PrimeNumberChecker { diff --git a/docs/src/main/asciidoc/spring-boot-properties.adoc b/docs/src/main/asciidoc/spring-boot-properties.adoc index 1547546f37c01..17ac3085e1e12 100644 --- a/docs/src/main/asciidoc/spring-boot-properties.adoc +++ b/docs/src/main/asciidoc/spring-boot-properties.adoc @@ -69,10 +69,10 @@ First, create a `GreetingResource` JAX-RS resource in the ---- package org.acme.spring.boot.properties; -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 GreetingResource { @@ -118,11 +118,11 @@ Now modify `GreetingResource` to start using the `GreetingProperties`: ---- package org.acme.spring.boot.properties; -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("/greeting") public class GreetingResource { @@ -191,11 +191,11 @@ And update the `GreetingResource` and its test `GreetingResourceTest`: ---- package org.acme.spring.boot.properties; -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("/greeting") public class GreetingResource { @@ -270,11 +270,11 @@ And update the `GreetingResource` and its test `GreetingResourceTest`: ---- package org.acme.spring.boot.properties; -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("/greeting") public class GreetingResource { @@ -364,11 +364,11 @@ greeting.message.text = hello ---- package org.acme.spring.boot.properties; -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("/greeting") public class GreetingResource { diff --git a/docs/src/main/asciidoc/spring-cache.adoc b/docs/src/main/asciidoc/spring-cache.adoc index 75807f3294506..667ffa5bcc955 100644 --- a/docs/src/main/asciidoc/spring-cache.adoc +++ b/docs/src/main/asciidoc/spring-cache.adoc @@ -133,9 +133,9 @@ import java.time.LocalDate; import java.util.Arrays; import java.util.List; -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 org.jboss.resteasy.reactive.RestQuery; diff --git a/docs/src/main/asciidoc/spring-cloud-config-client.adoc b/docs/src/main/asciidoc/spring-cloud-config-client.adoc index 12978d647ccec..dc8dbc2dac2f8 100644 --- a/docs/src/main/asciidoc/spring-cloud-config-client.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config-client.adoc @@ -65,10 +65,10 @@ First, create a simple `GreetingResource` JAX-RS resource in the ---- package org.acme.spring.spring.cloud.config.client; -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 GreetingResource { @@ -87,10 +87,10 @@ As we want to use configuration properties obtained from the Config Server, we w ---- package org.acme.spring.spring.cloud.config.client; -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.config.inject.ConfigProperty; diff --git a/docs/src/main/asciidoc/spring-data-jpa.adoc b/docs/src/main/asciidoc/spring-data-jpa.adoc index 66350c5c6578a..724e70274d3c6 100644 --- a/docs/src/main/asciidoc/spring-data-jpa.adoc +++ b/docs/src/main/asciidoc/spring-data-jpa.adoc @@ -67,9 +67,9 @@ Throughout the course of this guide, the following JPA Entity will be used: ---- package org.acme.spring.data.jpa; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Fruit { @@ -192,11 +192,11 @@ Create `FruitResource` with the following content: ---- package org.acme.spring.data.jpa; -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 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 java.util.List; import java.util.Optional; diff --git a/docs/src/main/asciidoc/spring-data-rest.adoc b/docs/src/main/asciidoc/spring-data-rest.adoc index 1c889b168c509..96ebe5eafc156 100644 --- a/docs/src/main/asciidoc/spring-data-rest.adoc +++ b/docs/src/main/asciidoc/spring-data-rest.adoc @@ -87,9 +87,9 @@ Throughout the course of this guide, the following JPA Entity will be used: ---- package org.acme.spring.data.rest; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Fruit { @@ -419,12 +419,12 @@ It is important to annotate the correct method in order to customize its REST en ==== Securing endpoints -This extension will automatically use the Security annotations within the package `javax.annotation.security` that are defined on your resource interfaces: +This extension will automatically use the Security annotations within the package `jakarta.annotation.security` that are defined on your resource interfaces: [source,java] ---- -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; @DenyAll public interface FruitResource extends CrudRepository { diff --git a/docs/src/main/asciidoc/spring-di.adoc b/docs/src/main/asciidoc/spring-di.adoc index 1b2100e4aaab0..d2afae25f9d79 100644 --- a/docs/src/main/asciidoc/spring-di.adoc +++ b/docs/src/main/asciidoc/spring-di.adoc @@ -203,10 +203,10 @@ package org.acme.spring.di; import org.springframework.beans.factory.annotation.Autowired; -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 GreeterResource { diff --git a/docs/src/main/asciidoc/spring-scheduled.adoc b/docs/src/main/asciidoc/spring-scheduled.adoc index e96aaf3123c4c..b3428806082b8 100644 --- a/docs/src/main/asciidoc/spring-scheduled.adoc +++ b/docs/src/main/asciidoc/spring-scheduled.adoc @@ -70,7 +70,7 @@ package org.acme.spring.scheduler; import org.springframework.scheduling.annotation.Scheduled; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped // <1> public class CounterBean { @@ -132,11 +132,11 @@ Create the `CountResource` class with the following content: ---- package org.acme.spring.scheduler; -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("/count") public class CountResource { diff --git a/docs/src/main/asciidoc/spring-web.adoc b/docs/src/main/asciidoc/spring-web.adoc index ce6664f34b23a..374526dd9c6c8 100644 --- a/docs/src/main/asciidoc/spring-web.adoc +++ b/docs/src/main/asciidoc/spring-web.adoc @@ -441,7 +441,7 @@ The following method return types are supported: === Controller method parameter types In addition to the method parameters that can be annotated with the appropriate Spring Web annotations from the previous table, -`javax.servlet.http.HttpServletRequest` and `javax.servlet.http.HttpServletResponse` are also supported. +`jakarta.servlet.http.HttpServletRequest` and `jakarta.servlet.http.HttpServletResponse` are also supported. For this to function however, users need to add the `quarkus-undertow` dependency. === Exception handler method return types @@ -514,7 +514,7 @@ The following table shows how Spring Web annotations can be converted to JAX-RS |@ExceptionHandler | -|No equivalent annotation in JAX-RS. Exceptions are handled by implementing `javax.ws.rs.ext.ExceptionMapper` +|No equivalent annotation in JAX-RS. Exceptions are handled by implementing `jakarta.ws.rs.ext.ExceptionMapper` |=== == More Spring guides diff --git a/docs/src/main/asciidoc/stork-kubernetes.adoc b/docs/src/main/asciidoc/stork-kubernetes.adoc index 41a12b19cfdef..0572cc5955726 100644 --- a/docs/src/main/asciidoc/stork-kubernetes.adoc +++ b/docs/src/main/asciidoc/stork-kubernetes.adoc @@ -315,9 +315,9 @@ package org.acme; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * The REST Client interface. @@ -348,10 +348,10 @@ package org.acme; import org.eclipse.microprofile.rest.client.inject.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; /** * A frontend API using our REST Client (which uses Stork to locate and select the service instance on each call). diff --git a/docs/src/main/asciidoc/stork.adoc b/docs/src/main/asciidoc/stork.adoc index 5d3358a6fa15b..1f20ac054c0b4 100644 --- a/docs/src/main/asciidoc/stork.adoc +++ b/docs/src/main/asciidoc/stork.adoc @@ -113,8 +113,8 @@ import io.quarkus.runtime.StartupEvent; import io.vertx.mutiny.core.Vertx; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class BlueService { @@ -148,8 +148,8 @@ import io.quarkus.runtime.StartupEvent; import io.vertx.mutiny.core.Vertx; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class RedService { @@ -190,8 +190,8 @@ import io.vertx.ext.consul.ConsulClientOptions; import io.vertx.mutiny.core.Vertx; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class Registration { @@ -234,9 +234,9 @@ package org.acme; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * The REST Client interface. @@ -269,10 +269,10 @@ package org.acme; import org.eclipse.microprofile.rest.client.inject.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; /** * A frontend API using our REST Client (which uses Stork to locate and select the service instance on each call). @@ -307,7 +307,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; @Provider public class CustomLoggingFilter implements ResteasyReactiveClientRequestFilter { diff --git a/docs/src/main/asciidoc/tests-with-coverage.adoc b/docs/src/main/asciidoc/tests-with-coverage.adoc index 10a87a396ab33..6d07b11c8569a 100644 --- a/docs/src/main/asciidoc/tests-with-coverage.adoc +++ b/docs/src/main/asciidoc/tests-with-coverage.adoc @@ -55,11 +55,11 @@ First, a JAX-RS resource serving a hello endpoint: ---- package org.acme.testcoverage; -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("/hello") public class GreetingResource { @@ -92,7 +92,7 @@ This endpoint uses a greeting service: ---- package org.acme.testcoverage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/docs/src/main/asciidoc/transaction.adoc b/docs/src/main/asciidoc/transaction.adoc index bc8561521b227..72a8e829ce443 100644 --- a/docs/src/main/asciidoc/transaction.adoc +++ b/docs/src/main/asciidoc/transaction.adoc @@ -43,7 +43,7 @@ the JTA `UserTransaction` API directly, however this is less user-friendly than === Declarative approach -The easiest way to define your transaction boundaries is to use the `@Transactional` annotation on your entry method (`javax.transaction.Transactional`). +The easiest way to define your transaction boundaries is to use the `@Transactional` annotation on your entry method (`jakarta.transaction.Transactional`). [source,java] ---- diff --git a/docs/src/main/asciidoc/validation.adoc b/docs/src/main/asciidoc/validation.adoc index 8e57b7f8b66e0..e43e9f1268685 100644 --- a/docs/src/main/asciidoc/validation.adoc +++ b/docs/src/main/asciidoc/validation.adoc @@ -76,8 +76,8 @@ Create the `org.acme.validation.Book` class with the following content: ---- package org.acme.validation; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Min; public class Book { @@ -103,10 +103,10 @@ Create the following REST resource as `org.acme.validation.BookResource`: ---- package org.acme.validation; -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("/books") public class BookResource { @@ -207,8 +207,8 @@ The best option is then to annotate a method of your business service with your ---- package org.acme.validation; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.Valid; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.Valid; @ApplicationScoped public class BookService { @@ -287,12 +287,12 @@ you can very easily tweak it by declaring replacement beans that will be injecte If you create a bean of the following types in your application, it will automatically be injected into the `ValidatorFactory` configuration: - * `javax.validation.ClockProvider` - * `javax.validation.ConstraintValidator` - * `javax.validation.ConstraintValidatorFactory` - * `javax.validation.MessageInterpolator` - * `javax.validation.ParameterNameProvider` - * `javax.validation.TraversableResolver` + * `jakarta.validation.ClockProvider` + * `jakarta.validation.ConstraintValidator` + * `jakarta.validation.ConstraintValidatorFactory` + * `jakarta.validation.MessageInterpolator` + * `jakarta.validation.ParameterNameProvider` + * `jakarta.validation.TraversableResolver` * `org.hibernate.validator.spi.properties.GetterPropertySelectionStrategy` * `org.hibernate.validator.spi.nodenameprovider.PropertyNodeNameProvider` * `org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory` @@ -335,7 +335,7 @@ public class MyEmailValidatorFactoryCustomizer implements ValidatorFactoryCustom ---- All beans implementing `ValidatorFactoryCustomizer` are applied, meaning you can have several of them. -If you need to enforce some ordering, you can use the usual `@javax.annotation.Priority` annotation - beans with higher priority are applied first. +If you need to enforce some ordering, you can use the usual `@jakarta.annotation.Priority` annotation - beans with higher priority are applied first. ==== Constraint validators as beans @@ -495,7 +495,7 @@ using a bootstrap that is Quarkus-specific. Creating a `ValidatorFactory` by yourself it not supported in native executables and if you try to do so, -you will get an error similar to `javax.validation.NoProviderFoundException: Unable to create a Configuration, because no +you will get an error similar to `jakarta.validation.NoProviderFoundException: Unable to create a Configuration, because no Jakarta Bean Validation provider could be found. Add a provider like Hibernate Validator (RI) to your classpath.` when running your native executable. diff --git a/docs/src/main/asciidoc/vertx-reference.adoc b/docs/src/main/asciidoc/vertx-reference.adoc index 9f65e43ff7baf..4af928c091ef6 100644 --- a/docs/src/main/asciidoc/vertx-reference.adoc +++ b/docs/src/main/asciidoc/vertx-reference.adoc @@ -167,12 +167,12 @@ Now, in your code, you can create an instance of `WebClient`: package org.acme.vertx; -import javax.annotation.PostConstruct; -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.PostConstruct; +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.smallrye.mutiny.Uni; @@ -263,10 +263,10 @@ package org.acme.vertx; import io.vertx.core.json.JsonObject; import io.vertx.core.json.JsonArray; -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") @Produces(MediaType.APPLICATION_JSON) @@ -348,7 +348,7 @@ import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.vertx.core.AbstractVerticle; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyBeanVerticle extends AbstractVerticle { @@ -375,8 +375,8 @@ package io.quarkus.vertx.verticles; import io.quarkus.runtime.StartupEvent; import io.vertx.mutiny.core.Vertx; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class VerticleDeployer { @@ -413,8 +413,8 @@ package org.acme.verticle; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.vertx.core.AbstractVerticle; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @Dependent public class MyVerticle extends AbstractVerticle { @@ -438,10 +438,10 @@ import io.quarkus.runtime.StartupEvent; import io.vertx.core.DeploymentOptions; import io.vertx.mutiny.core.Vertx; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class MyApp { @@ -488,7 +488,7 @@ package org.acme.vertx; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { @@ -526,7 +526,7 @@ package org.acme.vertx; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import io.smallrye.mutiny.Uni; @@ -659,11 +659,11 @@ import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.eventbus.EventBus; import io.vertx.mutiny.core.eventbus.Message; -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("/async") public class EventResource { @@ -760,11 +760,11 @@ import io.smallrye.mutiny.Uni; import io.vertx.mutiny.core.eventbus.EventBus; import io.vertx.mutiny.core.eventbus.Message; -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("/bus") public class EventResource { @@ -797,7 +797,7 @@ package org.acme.vertx; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { @@ -850,9 +850,9 @@ import io.vertx.ext.web.Router; import io.vertx.ext.web.handler.sockjs.SockJSBridgeOptions; import io.vertx.ext.web.handler.sockjs.SockJSHandler; -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 java.util.concurrent.atomic.AtomicInteger; @ApplicationScoped diff --git a/docs/src/main/asciidoc/vertx.adoc b/docs/src/main/asciidoc/vertx.adoc index 089c64cda1fa2..1f26c616b5fcb 100644 --- a/docs/src/main/asciidoc/vertx.adoc +++ b/docs/src/main/asciidoc/vertx.adoc @@ -121,9 +121,9 @@ import io.vertx.mutiny.core.Vertx; import java.nio.charset.StandardCharsets; -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("/vertx") // <1> public class VertxResource { @@ -291,7 +291,7 @@ So, first, add the following imports to the `src/main/java/org/acme/VertxResourc ---- import io.vertx.mutiny.core.eventbus.EventBus; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; ---- @@ -324,7 +324,7 @@ package org.acme; import io.quarkus.vertx.ConsumeEvent; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped // <1> public class GreetingService { diff --git a/docs/src/main/asciidoc/virtual-threads.adoc b/docs/src/main/asciidoc/virtual-threads.adoc index a1df10eb19821..abd75832d04d2 100644 --- a/docs/src/main/asciidoc/virtual-threads.adoc +++ b/docs/src/main/asciidoc/virtual-threads.adoc @@ -158,8 +158,8 @@ import org.acme.fortune.repository.FortuneRepository; import io.smallrye.common.annotation.RunOnVirtualThread; import io.smallrye.mutiny.Uni; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.List; import java.util.Random; @@ -209,8 +209,8 @@ import org.acme.fortune.repository.FortuneRepository; import io.smallrye.common.annotation.RunOnVirtualThread; import io.smallrye.mutiny.Uni; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.util.List; import java.util.Random; diff --git a/docs/src/main/asciidoc/websockets.adoc b/docs/src/main/asciidoc/websockets.adoc index 9ac772c40a532..e517ca24f9001 100644 --- a/docs/src/main/asciidoc/websockets.adoc +++ b/docs/src/main/asciidoc/websockets.adoc @@ -78,14 +78,14 @@ package org.acme.websockets; 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.server.PathParam; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.Session; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.Session; @ServerEndpoint("/chat/{username}") // <1> @ApplicationScoped @@ -170,7 +170,7 @@ You can also test your web socket applications using the approach detailed {quic Quarkus also contains a WebSocket client. You can call `ContainerProvider.getWebSocketContainer().connectToServer` to create a websocket connection. By default, the `quarkus-websockets` artifact includes both client and server support. However, if you only want the client you can include `quarkus-websockets-client` instead. -When you connect to the server you can either pass in the Class of the annotated client endpoint you want to use, or an instance of `javax.websocket.Endpoint`. If you +When you connect to the server you can either pass in the Class of the annotated client endpoint you want to use, or an instance of `jakarta.websocket.Endpoint`. If you are using the annotated endpoint then you can use the exact same annotations as you can on the server, except it must be annotated with `@ClientEndpoint` instead of `@ServerEndpoint`. @@ -184,11 +184,11 @@ import java.net.URI; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +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/docs/src/main/asciidoc/writing-extensions.adoc b/docs/src/main/asciidoc/writing-extensions.adoc index 91e6bcb283a32..c0625b131859a 100644 --- a/docs/src/main/asciidoc/writing-extensions.adoc +++ b/docs/src/main/asciidoc/writing-extensions.adoc @@ -1991,8 +1991,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.Liveness; import org.eclipse.microprofile.health.HealthCheck; @@ -2383,7 +2383,7 @@ The CDI layer processes CDI beans that are either explicitly registered or that .Register a Bean Defining Annotation [source,java] ---- -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.DotName; import io.quarkus.extest.runtime.TestAnnotation; @@ -2692,13 +2692,13 @@ public final class MyExtProcessor { resource.produce(new NativeImageResourceBuildItem( "META-INF/my-descriptor.xml")); //<2> - resourceBundle.produce(new NativeImageResourceBuildItem("javax.xml.bind.Messages")); //<3> + resourceBundle.produce(new NativeImageResourceBuildItem("jakarta.xml.bind.Messages")); //<3> } } ---- <1> Indicate that the /security/runtime.keys classpath resource should be copied into native image. <2> Indicate that the `META-INF/my-descriptor.xml` resource should be copied into native image -<3> Indicate that the "javax.xml.bind.Messages" resource bundle should be copied into native image. +<3> Indicate that the "jakarta.xml.bind.Messages" resource bundle should be copied into native image. ==== Service files diff --git a/docs/src/main/asciidoc/writing-native-applications-tips.adoc b/docs/src/main/asciidoc/writing-native-applications-tips.adoc index 9f980abf296d9..c5a30df7100d9 100644 --- a/docs/src/main/asciidoc/writing-native-applications-tips.adoc +++ b/docs/src/main/asciidoc/writing-native-applications-tips.adoc @@ -175,7 +175,7 @@ If we were to use the code above, we would get an exception like the following w [source] ---- -Exception handling request to /person: org.jboss.resteasy.spi.UnhandledException: javax.json.bind.JsonbException: Can't create instance of a class: class org.acme.jsonb.Person, No default constructor found +Exception handling request to /person: org.jboss.resteasy.spi.UnhandledException: jakarta.json.bind.JsonbException: Can't create instance of a class: class org.acme.jsonb.Person, No default constructor found ---- or if you are using Jackson: diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java index 59f72061b792d..404c5e95efc62 100644 --- a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java +++ b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java @@ -9,10 +9,11 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.inject.Default; -import javax.inject.Singleton; import javax.sql.XADataSource; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Singleton; + import org.jboss.jandex.DotName; import org.jboss.logging.Logger; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java index bff4db9e227e6..ae450c67ebb3e 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java @@ -4,7 +4,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Gauge; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java index 84e109ece6f44..eed6b117bf038 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DataSourceHealthCheckWithExtraProducerTest.java @@ -11,10 +11,11 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; -import javax.enterprise.inject.Produces; -import javax.inject.Qualifier; import javax.sql.DataSource; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Qualifier; + import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java index eca93780eaee3..82a39be7771e9 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java @@ -10,7 +10,7 @@ import java.sql.SQLException; import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeResource.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeResource.java index f9aa6c7f1ba61..6f275b84147e2 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeResource.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeResource.java @@ -5,10 +5,11 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; import javax.sql.DataSource; -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("/dev") public class DevModeResource { diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java index d8a641e6299a1..572663fce573f 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java @@ -5,10 +5,10 @@ import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.agroal.api.AgroalDataSource; import io.quarkus.agroal.DataSource; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java index bf750efb887e0..60c402a7c5585 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevServicesH2DatasourceTestCase.java @@ -8,7 +8,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DisabledTransactionDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DisabledTransactionDataSourceConfigTest.java index 18c40907e778b..7d119341a723e 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DisabledTransactionDataSourceConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DisabledTransactionDataSourceConfigTest.java @@ -6,7 +6,7 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java index 1352b04bc6fdc..aa9dfd71843ed 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/FlushOnCloseDataSourceConfigTest.java @@ -8,8 +8,8 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.asset.EmptyAsset; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java index 1c0506a38b8bf..2348746ad5e61 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java @@ -4,7 +4,7 @@ import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java index d8154cc39634b..51e74c5372284 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java @@ -4,7 +4,7 @@ import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java index 786123ddcabea..149d0c55bb4a5 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java @@ -6,7 +6,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java index 0fd72eeccf9be..5560036234a51 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java @@ -7,7 +7,7 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoNettyDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoNettyDataSourceConfigTest.java index 263f4651bf2b5..996c11cc81bcb 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoNettyDataSourceConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoNettyDataSourceConfigTest.java @@ -3,7 +3,7 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java index 510ecb9608893..a05e53a1c991b 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolInterceptorsTest.java @@ -3,8 +3,8 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java index 20a8b2dd85e68..e575e9072b3bb 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java @@ -4,7 +4,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java index b5a5e602e85b5..48c87cca8dc2b 100644 --- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java +++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java @@ -7,7 +7,7 @@ import java.sql.SQLException; import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java index cdf7ea6fde4e6..69c70c6dd6bb1 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Qualifier used to specify which datasource will be injected. diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java index e0c703bc38a0c..fe497d2ce0bf2 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java @@ -13,13 +13,13 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Singleton; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.jboss.logging.Logger; import org.jboss.tm.XAResourceRecoveryRegistry; diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/JdbcDriver.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/JdbcDriver.java index 60e69bfca3b5d..1791d3b78f1e8 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/JdbcDriver.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/JdbcDriver.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Defines which database the JDBC driver is compatible with. diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/health/DataSourceHealthCheck.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/health/DataSourceHealthCheck.java index dcf5df7c3664e..36f7fd7d7a2fd 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/health/DataSourceHealthCheck.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/health/DataSourceHealthCheck.java @@ -5,10 +5,11 @@ import java.util.Map; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; import javax.sql.DataSource; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; + import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.HealthCheckResponseBuilder; diff --git a/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java index 9a7b50c9a38ce..375acb1a72f0d 100644 --- a/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java +++ b/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.concurrent.Future; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java index 63cd0cdcc30ea..0d4e47b984ee0 100644 --- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java +++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java @@ -1,9 +1,9 @@ package ${package}; -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 GreetingResource { diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java index 9ea933ac90f4f..74bdaa92f3b69 100644 --- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java +++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java index f06d78ddce59d..dc16614d36a37 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java @@ -3,11 +3,11 @@ import java.util.Collections; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java index 2b31ac455fc1f..4984b060fc758 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java index 4b1c91c3ff8e5..f655a66a59b8d 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java @@ -5,10 +5,10 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java index 63cd0cdcc30ea..0d4e47b984ee0 100644 --- a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java +++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java @@ -1,9 +1,9 @@ package ${package}; -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 GreetingResource { diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java index 9ea933ac90f4f..74bdaa92f3b69 100644 --- a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java +++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java index 12cf93ac581e4..13d69b62cc9e1 100644 --- a/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java +++ b/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.concurrent.Future; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java index 101885641518e..aedfc48fce2cf 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java +++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/AwsHttpContextProducers.java @@ -3,11 +3,11 @@ import java.util.Collections; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.amazonaws.services.lambda.runtime.Context; diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java index 0a4ed7294ae72..f9724fa8b4837 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java +++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/DefaultLambdaIdentityProvider.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext; diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java index ad7b7f234911b..e535a4213a799 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java +++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpAuthenticationMechanism.java @@ -5,10 +5,10 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; import io.quarkus.security.identity.IdentityProvider; diff --git a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java index c8d78d0caf3b2..17b71080c46e1 100644 --- a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java +++ b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java index d6f98929b281d..17972d771aa51 100644 --- a/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java +++ b/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -2,11 +2,11 @@ import java.util.concurrent.Future; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java index 8c6a5b24ebaca..0e01f030363cc 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java @@ -1,6 +1,6 @@ package ${package}; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProcessingService { diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambda.java b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambda.java index 314f90bd18f3c..2cf39878ca243 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambda.java +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/StreamLambda.java @@ -1,6 +1,6 @@ package ${package}; -import javax.inject.Named; +import jakarta.inject.Named; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestLambda.java b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestLambda.java index 167b7f25510b2..640ca4f195094 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestLambda.java +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestLambda.java @@ -1,7 +1,7 @@ package ${package}; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedLambda.java b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedLambda.java index 8f218add00908..8d11a903fb1c9 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedLambda.java +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedLambda.java @@ -1,7 +1,7 @@ package ${package}; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; diff --git a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaConfig.java b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaConfig.java index c22d3462f2bf4..8335b3f3d3a08 100644 --- a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaConfig.java +++ b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaConfig.java @@ -10,7 +10,7 @@ public class LambdaConfig { /** - * The handler name. Handler names are specified on handler classes using the {@link @javax.inject.Named} annotation. + * The handler name. Handler names are specified on handler classes using the {@link @jakarta.inject.Named} annotation. * * If this name is unspecified and there is exactly one unnamed implementation of * {@link com.amazonaws.services.lambda.runtime.RequestHandler} diff --git a/extensions/arc/deployment/pom.xml b/extensions/arc/deployment/pom.xml index 74666d60cd6c4..d3ae086a16991 100644 --- a/extensions/arc/deployment/pom.xml +++ b/extensions/arc/deployment/pom.xml @@ -46,9 +46,9 @@ - org.jboss.spec.javax.ejb - jboss-ejb-api_3.1_spec - 1.0.2.Final + jakarta.ejb + jakarta.ejb-api + 4.0.1 test diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java index 228f0e8845a34..9ea0451e9e748 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java @@ -38,7 +38,7 @@ public class ArcConfig { *
  • does not have a name,
    • *
  • does not declare an observer,
    • *
  • does not declare any producer which is eligible for injection to any injection point,
    • - *
  • is not directly eligible for injection into any {@link javax.enterprise.inject.Instance} injection point
    • + *
  • is not directly eligible for injection into any {@link jakarta.enterprise.inject.Instance} injection point
    • *
* * @see UnremovableBeanBuildItem @@ -97,14 +97,14 @@ public class ArcConfig { * * Each element value is used to match an alternative bean class, an alternative stereotype annotation type or a bean class * that declares an alternative producer. If any value matches then the priority of {@link Integer#MAX_VALUE} is used for - * the relevant bean. The priority declared via {@link javax.annotation.Priority} or + * the relevant bean. The priority declared via {@link jakarta.annotation.Priority} or * {@link io.quarkus.arc.AlternativePriority} is overridden. */ @ConfigItem public Optional> selectedAlternatives; /** - * If set to true then {@code javax.enterprise.inject.Produces} is automatically added to all non-void methods that are + * If set to true then {@code jakarta.enterprise.inject.Produces} is automatically added to all non-void methods that are * annotated with a scope annotation, a stereotype or a qualifier, and are not annotated with {@code Inject} or * {@code Produces}, and no parameter is annotated with {@code Disposes}, {@code Observes} or {@code ObservesAsync}. */ @@ -171,8 +171,8 @@ public class ArcConfig { * If set to true then the container attempts to detect wrong usages of annotations and eventually fails the build to * prevent unexpected behavior of a Quarkus application. *

- * A typical example is {@code @javax.ejb.Singleton} which is often confused with {@code @javax.inject.Singleton}. As a - * result a component annotated with {@code @javax.ejb.Singleton} would be completely ignored. Another example is an inner + * A typical example is {@code @jakarta.ejb.Singleton} which is often confused with {@code @jakarta.inject.Singleton}. As a + * result a component annotated with {@code @jakarta.ejb.Singleton} would be completely ignored. Another example is an inner * class annotated with a scope annotation - this component would be again completely ignored. */ @ConfigItem(defaultValue = "true") diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java index faa0e98f9f3b3..de570503f99e5 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java @@ -19,10 +19,10 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.AmbiguousResolutionException; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; @@ -681,7 +681,7 @@ void initTestApplicationClassPredicateBean(ArcRecorder recorder, BeanContainerBu @BuildStep List marker() { return Arrays.asList(new AdditionalApplicationArchiveMarkerBuildItem("META-INF/beans.xml"), - new AdditionalApplicationArchiveMarkerBuildItem("META-INF/services/javax.enterprise.inject.spi.Extension")); + new AdditionalApplicationArchiveMarkerBuildItem("META-INF/services/jakarta.enterprise.inject.spi.Extension")); } @BuildStep diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectAnnotationBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectAnnotationBuildItem.java index 9cdcb3ed4ae7d..7790980340de8 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectAnnotationBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectAnnotationBuildItem.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.jandex.DotName; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java index a1cf21c30d99e..6baf5c6ab4d2d 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java index 978b99960df4e..5229798998106 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java @@ -26,8 +26,8 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.CreationException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.CreationException; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigValue; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java index 308bb79a6a653..329201ab1a131 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/InterceptorBindingRegistrarBuildItem.java @@ -5,7 +5,7 @@ /** * Makes it possible to register annotations that should be considered interceptor bindings but are not annotated with - * {@code javax.interceptor.InterceptorBinding}. + * {@code jakarta.interceptor.InterceptorBinding}. */ public final class InterceptorBindingRegistrarBuildItem extends MultiBuildItem { @@ -18,4 +18,4 @@ public InterceptorBindingRegistrarBuildItem(InterceptorBindingRegistrar registra public InterceptorBindingRegistrar getInterceptorBindingRegistrar() { return registrar; } -} \ No newline at end of file +} diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java index 61ba26d156ec8..500f13b1ebe4a 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java @@ -5,7 +5,7 @@ /** * Makes it possible to register annotations that should be considered qualifiers but are not annotated with - * {@code javax.inject.Qualifier}. + * {@code jakarta.inject.Qualifier}. */ public final class QualifierRegistrarBuildItem extends MultiBuildItem { @@ -18,4 +18,4 @@ public QualifierRegistrarBuildItem(QualifierRegistrar registrar) { public QualifierRegistrar getQualifierRegistrar() { return registrar; } -} \ No newline at end of file +} diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java index 4e08d4f01c182..8fe0e03af62b2 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java @@ -5,9 +5,9 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.ObserverMethod; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StereotypeRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StereotypeRegistrarBuildItem.java index 578850c253ffd..dfd84bb58ce5d 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StereotypeRegistrarBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StereotypeRegistrarBuildItem.java @@ -5,7 +5,7 @@ /** * Makes it possible to register annotations that should be considered stereotypes but are not annotated with - * {@code javax.enterprise.inject.Stereotype}. + * {@code jakarta.enterprise.inject.Stereotype}. */ public final class StereotypeRegistrarBuildItem extends MultiBuildItem { diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java index 7161c6bf4cb55..f48c4cbbde3e3 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java @@ -6,7 +6,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.enterprise.inject.CreationException; +import jakarta.enterprise.inject.CreationException; import org.jboss.jandex.DotName; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java index e10d994a4e877..2d7434b23e08b 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationUsageProcessor.java @@ -42,12 +42,12 @@ void detect(ArcConfig config, ApplicationIndexBuildItem applicationIndex, Custom @Override public String apply(AnnotationInstance annotationInstance) { - return String.format("%s declared on %s, use @javax.inject.Singleton instead", + return String.format("%s declared on %s, use @jakarta.inject.Singleton instead", annotationInstance.toString(false), getTargetInfo(annotationInstance)); } }; unsupported.add(new UnsupportedAnnotation(DotName.createSimple("com.google.inject.Singleton"), singletonFun)); - unsupported.add(new UnsupportedAnnotation(DotName.createSimple("javax.ejb.Singleton"), singletonFun)); + unsupported.add(new UnsupportedAnnotation(DotName.createSimple("jakarta.ejb.Singleton"), singletonFun)); unsupported.add(new UnsupportedAnnotation(DotName.createSimple("groovy.lang.Singleton"), singletonFun)); unsupported.add(new UnsupportedAnnotation(DotName.createSimple("jakarta.ejb.Singleton"), singletonFun)); diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevInterceptorInfo.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevInterceptorInfo.java index fcdc7679623ee..1322965d7693d 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevInterceptorInfo.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevInterceptorInfo.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.InterceptionType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.MethodInfo; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java index 372e3aa0eb92b..c24383d931a0e 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; import io.quarkus.arc.deployment.CompletedApplicationClassPredicateBuildItem; import io.quarkus.arc.processor.ObserverInfo; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java index da06c71e42253..c8716fb2ed2d2 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java @@ -20,9 +20,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.inject.spi.InterceptionType; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/extensions/arc/deployment/src/test/java/B.java b/extensions/arc/deployment/src/test/java/B.java index 5194ebda21cdd..f066e8bebfc5c 100644 --- a/extensions/arc/deployment/src/test/java/B.java +++ b/extensions/arc/deployment/src/test/java/B.java @@ -1,8 +1,8 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/arc/deployment/src/test/java/C.java b/extensions/arc/deployment/src/test/java/C.java index aa51f51320b50..57cac3b6b2179 100644 --- a/extensions/arc/deployment/src/test/java/C.java +++ b/extensions/arc/deployment/src/test/java/C.java @@ -1,6 +1,6 @@ -import javax.inject.Inject; +import jakarta.inject.Inject; -@javax.inject.Singleton +@jakarta.inject.Singleton public class C { private B b; diff --git a/extensions/arc/deployment/src/test/java/L.java b/extensions/arc/deployment/src/test/java/L.java index f385d890d5113..8151246b643f1 100644 --- a/extensions/arc/deployment/src/test/java/L.java +++ b/extensions/arc/deployment/src/test/java/L.java @@ -1,4 +1,4 @@ -@javax.inject.Singleton +@jakarta.inject.Singleton public class L { private final C c; diff --git a/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java b/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java index a7427a72b0e86..a9aa3ea64f38c 100644 --- a/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java +++ b/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java @@ -1,6 +1,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBean.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBean.java index 35c473f0c65bb..9a5049bfaa727 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBean.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBean.java @@ -3,10 +3,10 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java index 9b162bfbf1fa4..5575471671ed6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/SimpleBeanTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.wildfly.common.Assert.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Foo.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Foo.java index 761f616c60fc0..62a140a633ad3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Foo.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Foo.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.alternatives; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Foo { @@ -9,4 +9,4 @@ public String ping() { return getClass().getName(); } -} \ No newline at end of file +} diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Producers.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Producers.java index e4af5a4981c40..996d5e1542764 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Producers.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/Producers.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.alternatives; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; @ApplicationScoped class Producers { @@ -16,4 +16,4 @@ class Producers { public String bravo() { return "bravo"; } -} \ No newline at end of file +} diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java index 655ea198f2988..8f0ba184b6df9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesFqcnTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java index dc24f009e36a9..06e46d962fa6c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageStartsTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java index 28d2579f8722c..0a4926974ef39 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesPackageTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java index d4a3d6f8e29d3..8fe9e7acc8cf9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/SelectedAlternativesSimpleNameTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/bar/MyStereotype.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/bar/MyStereotype.java index ee139c1661646..1943f5bdcf24f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/bar/MyStereotype.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/alternatives/bar/MyStereotype.java @@ -5,9 +5,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; @Alternative @Dependent @@ -15,4 +15,4 @@ @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) public @interface MyStereotype { -} \ No newline at end of file +} diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java index 44f28a75620f3..5583e5fa4a005 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java index a30169b488337..4ab973c62960e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/arguments/CommandLineArgumentsTestCase.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.arguments; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java index 96b10acffdbbd..186a3539705f3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java @@ -12,10 +12,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java index 231b3adb4f36a..e45da53066d4b 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodDisabledTest.java @@ -11,12 +11,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java index 75a497e3afe32..dadedda6c431f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java @@ -14,11 +14,11 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Model; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Model; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java index ec9038412da26..9212a428a2224 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java @@ -6,9 +6,9 @@ import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; @@ -59,7 +59,7 @@ public void execute(BuildContext context) { }).setLogRecordPredicate(log -> "AutoScopeBuildItemTest".equals(log.getLoggerName())) .assertLogRecords(records -> { assertEquals(1, records.size()); - assertEquals("javax.inject.Singleton:Foo!", records.get(0).getMessage()); + assertEquals("jakarta.inject.Singleton:Foo!", records.get(0).getMessage()); }); @Inject diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/bda/BeanDefiningAnnotationScopeTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/bda/BeanDefiningAnnotationScopeTest.java index 069008aba8a71..775811adf046c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/bda/BeanDefiningAnnotationScopeTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/bda/BeanDefiningAnnotationScopeTest.java @@ -12,13 +12,13 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Stereotype; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java index d9a1741335be7..dd7c6e61b8037 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java index 1762af06bdf97..8132c0b8e796f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigImplicitConverterTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingInstanceTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingInstanceTest.java index 95b6085d8efac..f06ef7b7f48e7 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingInstanceTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingInstanceTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java index e651d90957fc2..be92a6f2d2c22 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java @@ -14,8 +14,8 @@ import java.util.OptionalInt; import java.util.stream.Stream; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.Converter; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java index f470551e44df5..213bdeea4f223 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java @@ -9,10 +9,10 @@ import java.util.OptionalInt; import java.util.OptionalLong; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java index 77240a0531527..89f7fecc2b2bd 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertiesTest.java @@ -5,9 +5,9 @@ import java.util.Map; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperties; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java index 98f8cacbdba5a..549b9c355218f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionValidationTest.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.config; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Assertions; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java index 01bd589c223bb..32e6d82fd2d20 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigPropertyInjectionWithoutInjectAnnotationTest.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.config; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java index c7f9cf265428b..3f80ccc8d7a2d 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/IndexedPropertiesInjectionTest.java @@ -14,8 +14,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.Converter; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java index 4dfe167c1c9ab..6d5c22e8347fe 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/NullConverterTest.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.config; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.Converter; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java index 056fa27eddfa8..a316b1170e49e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigMappingTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java index ec4afc607053d..d025706df9030 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertiesTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java index c961a8c0f6610..a5d5388e47ec9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/RemovedConfigPropertyTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/SomeBeanUsingConfig.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/SomeBeanUsingConfig.java index 36eaee3a6f50c..b4a834ae028f6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/SomeBeanUsingConfig.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/SomeBeanUsingConfig.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.config; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java index 62aec774965d9..a7278367d2a54 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/UnremovedConfigMappingTest.java @@ -3,7 +3,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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java index 283fe7c195cd3..d92809ccf9814 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configroot/ConfigRootInjectionTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java index f4dcc8e6606ed..5d84c548c495f 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/context/CustomPseudoScopeTest.java @@ -15,10 +15,10 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.inject.Inject; -import javax.inject.Scope; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.inject.Inject; +import jakarta.inject.Scope; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java index ca364db576e2f..9bd7c3c57fabc 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java @@ -7,8 +7,8 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/Bravo.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/Bravo.java index 964fc97dd09d2..614a9059c827d 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/Bravo.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/Bravo.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.exclude; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.test.exclude.ExcludeTypesTest.Pong; @@ -11,4 +11,4 @@ public String ping() { return "bravo"; } -} \ No newline at end of file +} diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java index e55696dd03de1..bccf5e4cdfbb6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java @@ -9,13 +9,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/bar/Bar.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/bar/Bar.java index 675518790cdb8..c349498b18d5c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/bar/Bar.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/bar/Bar.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.exclude.bar; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.test.exclude.ExcludeTypesTest.Pong; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/baz/bazzz/Baz.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/baz/bazzz/Baz.java index 7aaf9eb3d40e2..23c41120554ad 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/baz/bazzz/Baz.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/baz/bazzz/Baz.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.exclude.baz.bazzz; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.test.exclude.ExcludeTypesTest.Pong; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/FailingPrivateInterceptedMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/FailingPrivateInterceptedMethodTest.java index 8bc478d83ee84..87bc7768536d5 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/FailingPrivateInterceptedMethodTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/FailingPrivateInterceptedMethodTest.java @@ -8,13 +8,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/IgnoredPrivateInterceptedMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/IgnoredPrivateInterceptedMethodTest.java index f8467967a3d04..422ee302fe943 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/IgnoredPrivateInterceptedMethodTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/IgnoredPrivateInterceptedMethodTest.java @@ -9,13 +9,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java index 4e02c449ade01..19e7c34eee335 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorBindingRegistrarTest.java @@ -9,12 +9,12 @@ import java.lang.annotation.Target; import java.util.List; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java index 9121031232e92..a685bce5d00c8 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/InterceptorNoBindingsTest.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptor; -import javax.annotation.Priority; -import javax.enterprise.inject.spi.DefinitionException; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java index eb0adf4a65c14..082c30442a385 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/interceptor/staticmethods/InterceptedStaticMethodTest.java @@ -12,11 +12,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java index cc63d6a773607..c076d9d791b79 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lock/LockTest.java @@ -14,8 +14,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java index 1d7490532b410..94830a723b2ec 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInjectionTest.java index 5803d5a16ce73..1858d9d334fcf 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInjectionTest.java @@ -8,13 +8,13 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInvalidTypeParamTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInvalidTypeParamTest.java index 1c9f5679ba5c2..79ca737402578 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInvalidTypeParamTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/ListInvalidTypeParamTest.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java index fc71f9b7581a3..7a2bd1491e9bf 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionOnProducersTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java index 4c1ff364a9267..e37891518caf7 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsCombinedTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java index c8c4fbd3951da..f94e26236cb78 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/LookupConditionsTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/MyQualifier.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/MyQualifier.java index 2e5b6351d93f4..ea481aa18e917 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/MyQualifier.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/lookup/MyQualifier.java @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Retention(RUNTIME) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java index 0da3f232c822a..75b890ebf8116 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.metadata; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AmbiguousAsyncObserverExceptionHandlerTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AmbiguousAsyncObserverExceptionHandlerTest.java index cef3e3cc92e63..aa01bb2e02b1c 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AmbiguousAsyncObserverExceptionHandlerTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AmbiguousAsyncObserverExceptionHandlerTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.AmbiguousResolutionException; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.inject.Singleton; +import jakarta.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java index b7f3ab2a5bf54..5920684e619ed 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/AsyncObserverTest.java @@ -11,14 +11,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.event.ObservesAsync; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java index b7e05fbe0ae6f..801babe116758 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/ObserverTransformerTest.java @@ -15,10 +15,10 @@ import java.util.Set; import java.util.function.Consumer; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java index 197d47f888252..72c05388e88a5 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileAllAnyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileAllAnyTest.java index f28c330a15e6d..26831ea64e904 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileAllAnyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileAllAnyTest.java @@ -6,9 +6,9 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java index 36d91c62f8fb1..59797986c3ca3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/IfBuildProfileTest.java @@ -6,16 +6,16 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/Logging.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/Logging.java index 9964d1c851c83..f699744c542a6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/Logging.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/Logging.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileAllAnyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileAllAnyTest.java index 23ff729b46940..c0d9838dc5ede 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileAllAnyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileAllAnyTest.java @@ -6,9 +6,9 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java index 3ade40320f219..cf20f2a8c22c4 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/profile/UnlessBuildProfileTest.java @@ -6,16 +6,16 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java index bbd3e8dd3ac3f..010097d43a565 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/CombinedBuildProfileAndBuildPropertiesTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java index 8a8f7fcf17f9a..5333920045e78 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/IfBuildPropertyTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java index 6f824c20ebb84..56e9af20d3a17 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java index 5626676e91df9..eefb7172061b6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java index 8b57925898fa3..06de4f30b28c9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java @@ -14,10 +14,10 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java index 51262ad14c2d5..564c62f4cb703 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/remove/RemoveFwkBeansTest.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.remove; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java index 85b099dbd5f62..c5f0097aaf1eb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/startup/StartupAnnotationTest.java @@ -6,12 +6,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java index d78cdfac814cd..3f8edb36b2cef 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedBeanTestCase.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java index db5cb47a226a8..2751f8c513ccf 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeHierarchyTestCase.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java index 87c7ab7485ed1..eb092ea23c5cc 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/stereotype/DoubleScopedStereotypeTestCase.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Bar.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Bar.java index 79cab85c69faa..ae5628c71e452 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Bar.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Bar.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.transform.injectionPoint; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import io.quarkus.arc.Unremovable; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/DummyBean.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/DummyBean.java index 85169d10c90a2..0538fb24a7826 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/DummyBean.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/DummyBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.transform.injectionPoint; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DummyBean { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/PrivateFieldInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/PrivateFieldInjectionTest.java index cca2b852439a1..7d51b32c658c1 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/PrivateFieldInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/PrivateFieldInjectionTest.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Simple.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Simple.java index e16ff97815961..273225937422e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Simple.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeDecorator.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeDecorator.java index fa5962042c06f..a48fc62c1980d 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeDecorator.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeDecorator.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.transform.injectionPoint; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @Dependent @Priority(1) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeInterceptor.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeInterceptor.java index 617ad8d4350c3..dcb6c2cdebc25 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeInterceptor.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/SomeInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.transform.injectionPoint; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple @Priority(1) diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/Foo.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/Foo.java index 616245bebbf80..1b2f25be619c3 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/Foo.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/Foo.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.transform.injectionPoint.diffPackage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class Foo { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/SomeBean.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/SomeBean.java index b27d0378c5184..9b884343e29a6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/SomeBean.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/transform/injectionPoint/diffPackage/SomeBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.transform.injectionPoint.diffPackage; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class SomeBean { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java index 8a67a04977691..e33c4e5ee321e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/AddMissingNoargsConstructorTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java index bc093ca197f6e..ab056a07cfbca 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FailedToAddMissingNoargsConstructorTest.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.unproxyable; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java index 65fbeb2be01bb..96e65e30377a6 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassDoNotRemoveFlagTest.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.unproxyable; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java index 1feb96aff89eb..775b76609cf5b 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalClassRemoveFlagTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalMethodRemoveFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalMethodRemoveFlagTest.java index 99ca1f42faefa..5880c65cab48e 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalMethodRemoveFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/FinalMethodRemoveFlagTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java index 3b91621ffb113..15c1007de2efb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java @@ -5,10 +5,10 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java index dfd22e456d9b4..928f97891e436 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorChangeFlagTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java index 2080250b28cbb..879dcf07122d0 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/PrivateNoArgsConstructorDoNotChangeFlagTest.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.unproxyable; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java index 08e16da21fe5d..8bd51672bdf20 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerAddMissingNoargsConstructorTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java index e655ec4d685a9..feb7c9ccb4032 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerFailedToAddMissingNoargsConstructorTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java index 4ebf0abe4de45..d69da5c035330 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java @@ -5,11 +5,11 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java index 5c21aedd73fe3..6f3fc94046f92 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/RequestScopedFinalMethodsTest.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.unproxyable; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java index acd789b187820..ef6a129fba0ff 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java @@ -5,8 +5,8 @@ import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Vetoed; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ApiLookupProblemDetectedTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ApiLookupProblemDetectedTest.java index 75993a7f51360..1506823c865ef 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ApiLookupProblemDetectedTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ApiLookupProblemDetectedTest.java @@ -7,7 +7,7 @@ import java.util.logging.Formatter; import java.util.logging.LogRecord; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ArcLookupProblemDetectedTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ArcLookupProblemDetectedTest.java index bdfb511d39fe7..664b4eeac7ece 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ArcLookupProblemDetectedTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ArcLookupProblemDetectedTest.java @@ -7,9 +7,9 @@ import java.util.logging.Formatter; import java.util.logging.LogRecord; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/Charlie.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/Charlie.java index 658ff83938c4a..871604772ff35 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/Charlie.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/Charlie.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.unused; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Charlie { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ProducerBean.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ProducerBean.java index a19e62a9026d5..392c7e5e85596 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ProducerBean.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/ProducerBean.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.unused; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import io.quarkus.arc.Unremovable; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java index 03a84facdf2dd..145dc34e435fe 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java @@ -3,10 +3,10 @@ import java.lang.reflect.Method; import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/subpackage/Beta.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/subpackage/Beta.java index faea7869514c0..6baf3315539cd 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/subpackage/Beta.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/subpackage/Beta.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.unused.subpackage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * Another unused bean that shouldn't be removed. diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java index 8f596ed83b45a..7097ff241f5b5 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ObserverOnInnerClassTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java index 964a73d6b6cd0..7a7b0e13944b5 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ProducerOnInnerClassTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java index bc896e2889bd3..743cdba3499aa 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/ScopeOnInnerClassTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java index e276c9dcdee0e..fa23c3038be6b 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongannotations/WrongSingletonTest.java @@ -6,9 +6,9 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ public class WrongSingletonTest { .addClasses(EjbSingleton.class)) .assertException(t -> { Throwable rootCause = ExceptionUtil.getRootCause(t); - assertTrue(rootCause.getMessage().contains("javax.ejb.Singleton"), t.toString()); + assertTrue(rootCause.getMessage().contains("jakarta.ejb.Singleton"), t.toString()); assertTrue(rootCause.getMessage().contains("com.google.inject.Singleton"), t.toString()); }); @@ -35,7 +35,7 @@ public void testValidationFailed() { fail(); } - @javax.ejb.Singleton + @jakarta.ejb.Singleton static class EjbSingleton { @Inject diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java index c9288d1874f34..f0b0643d833a8 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java @@ -8,9 +8,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Retention(RUNTIME) @@ -45,4 +45,4 @@ public String value() { } -} \ No newline at end of file +} diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupIfProperty.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupIfProperty.java index d35ca529779c9..6e86cc5bf12d5 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupIfProperty.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupIfProperty.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; /** * Indicates that a bean should only be obtained by programmatic lookup if the property matches the provided value. diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupUnlessProperty.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupUnlessProperty.java index 229288f7dba8b..0840aadaaf7fe 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupUnlessProperty.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/lookup/LookupUnlessProperty.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; /** * Indicates that a bean should only be obtained by programmatic lookup if the property does not match the provided value. diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java index 4b5dabc4c4b33..678b92d0014cd 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Stereotype; /** * This built-in stereotype is automatically added to all additional beans that do not have a scope annotation declared. diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java index 77dfa066f4e78..7594bb3bb9c47 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainer.java @@ -84,7 +84,7 @@ default T instance(Class type, Annotation... qualifiers) { * } * * - * @return the context for {@link javax.enterprise.context.RequestScoped} + * @return the context for {@link jakarta.enterprise.context.RequestScoped} * @throws IllegalStateException If the container is not running */ ManagedContext requestContext(); diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigBeanCreator.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigBeanCreator.java index 88092c81b6bb8..4d0fdaf4efaad 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigBeanCreator.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigBeanCreator.java @@ -2,9 +2,9 @@ import java.util.Map; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.DeploymentException; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.InjectionPoint; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java index 276b55345b2fe..d59f8f67df12c 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java @@ -4,9 +4,9 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.InjectionPoint; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperties; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java index 5b5331cd74f53..72067f2afa0b8 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java @@ -8,7 +8,7 @@ import java.util.Objects; import java.util.Set; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/InterceptorBindings.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/InterceptorBindings.java index d72d6e40569c4..4ace62d76588f 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/InterceptorBindings.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/InterceptorBindings.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.AbstractAnnotationLiteral; import io.quarkus.arc.ArcInvocationContext; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LaunchModeProducer.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LaunchModeProducer.java index 56097f13886cc..032cf606ab805 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LaunchModeProducer.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LaunchModeProducer.java @@ -1,7 +1,7 @@ package io.quarkus.arc.runtime; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import io.quarkus.runtime.LaunchMode; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java index c6ba2847d7a97..6742cfb215241 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java @@ -4,11 +4,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java index 72c0cb997ead1..e5e1e7298a1f6 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java @@ -7,14 +7,14 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.EventMetadata; -import javax.inject.Singleton; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.EventMetadata; +import jakarta.inject.Singleton; @Singleton public class EventsMonitor { diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java index 9fc6d20629be1..611e46898dc5b 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java @@ -3,17 +3,17 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.enterprise.event.ObservesAsync; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Intercepted; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Intercepted; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java index f46e1ab4923b1..5f43e0d396743 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java @@ -2,7 +2,7 @@ import java.lang.reflect.Method; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import io.quarkus.arc.InjectableBean; diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java index 0a65ff3bee254..61f1189c55d8d 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class InvocationsMonitor { diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java index bd8a9e1c15d24..6c3c7c2601940 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Inherited @InterceptorBinding diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java index 9e47053377c35..1971672176ca6 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.runtime.test.TestApplicationClassPredicate; diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java index 907779962d749..e6261081f5cf9 100644 --- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java +++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java @@ -26,8 +26,8 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java index 936c2e93e1e21..8940882f42018 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java @@ -8,9 +8,9 @@ import java.time.Duration; -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 org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java index 508bc2f84ea0b..e93a65fd7599f 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java @@ -8,10 +8,10 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java index dd59c088dcd33..2193524435925 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java index 144d98304ecee..f7edf4f476d9d 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadResource.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadResource.java index 620c2561058d4..0a48840317e53 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadResource.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/devmode/CacheHotReloadResource.java @@ -1,9 +1,9 @@ package io.quarkus.cache.test.devmode; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.cache.CacheResult; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyGeneratorTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyGeneratorTest.java index 8c5617244ca0c..f715b610ddd29 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyGeneratorTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyGeneratorTest.java @@ -8,14 +8,14 @@ import java.math.BigInteger; import java.security.SecureRandom; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java index ca592c53b6f5a..a96e3fc57799b 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java @@ -8,9 +8,9 @@ import java.util.Arrays; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompletionStageReturnTypeTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompletionStageReturnTypeTest.java index 823fe07a0df2e..1f449eabaa705 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompletionStageReturnTypeTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompletionStageReturnTypeTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java index c021e73ea9274..d3a7d951edc63 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java @@ -10,8 +10,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/DefaultKeyCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/DefaultKeyCacheTest.java index 62876b19f45ce..88eba8e8165ce 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/DefaultKeyCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/DefaultKeyCacheTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java index 7da8ef9ffc4de..c3dbb591d9633 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java @@ -5,8 +5,8 @@ import java.math.BigDecimal; import java.util.Locale; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitSimpleKeyCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitSimpleKeyCacheTest.java index 5cdfe92b1fbec..df971786cd595 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitSimpleKeyCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitSimpleKeyCacheTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitCompositeKeyCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitCompositeKeyCacheTest.java index b1c3dd6c5a3df..6c30dee27bdc8 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitCompositeKeyCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitCompositeKeyCacheTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitSimpleKeyCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitSimpleKeyCacheTest.java index 397d9816c2b4f..0ccb2d233a7d4 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitSimpleKeyCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ImplicitSimpleKeyCacheTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultiValueTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultiValueTest.java index 69d051b026a42..d4cb97a47c204 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultiValueTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultiValueTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultipleCacheAnnotationsTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultipleCacheAnnotationsTest.java index 3a887208cfdcf..741241c78a0bf 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultipleCacheAnnotationsTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/MultipleCacheAnnotationsTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java index cabfbd1f1f800..ee85ca6927b93 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java @@ -6,8 +6,8 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java index a446a0665e78b..98f3d9b366b49 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ProgrammaticApiTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ProgrammaticApiTest.java index c88078ca58a5c..c511e5a39ec26 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ProgrammaticApiTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ProgrammaticApiTest.java @@ -16,8 +16,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SharedCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SharedCacheTest.java index b2a22736dfb0c..b960df270ee2c 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SharedCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SharedCacheTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SpecializedCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SpecializedCacheTest.java index 5bcbee0a5b0dc..92bcdb043d36e 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SpecializedCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/SpecializedCacheTest.java @@ -5,8 +5,8 @@ import java.util.function.Function; import java.util.function.Predicate; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java index f727969910204..a151e6cd29434 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java @@ -5,8 +5,8 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniReturnTypeTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniReturnTypeTest.java index 2032442f72b79..bd8be955cd497 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniReturnTypeTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UniReturnTypeTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java index 7ea8c94f317b2..ddec12d8a44e2 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; 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.extension.RegisterExtension; diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java index 49fa7c596ef93..278e3779a81f0 100644 --- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java +++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java index cddf7e91d6b3e..9ea1a4ed9905a 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import io.quarkus.cache.CacheInvalidate.List; import io.quarkus.cache.runtime.UndefinedCacheKeyGenerator; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java index 62b8ebb808b6a..fc938f6f10817 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import io.quarkus.cache.CacheInvalidateAll.List; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java index ec1e1ad4d8d42..ea411baa8bea8 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; /** *

diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java index 3347feabe8f63..3f05ba995f758 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import io.quarkus.cache.runtime.UndefinedCacheKeyGenerator; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java index ed67b2ca57f78..c66bbe53dae8b 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java @@ -11,10 +11,10 @@ import java.util.concurrent.CompletionStage; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.interceptor.Interceptor.Priority; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor.Priority; +import jakarta.interceptor.InvocationContext; import org.jboss.logging.Logger; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java index 4d504f62e391d..431a647ead897 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java @@ -2,10 +2,10 @@ import java.util.function.Function; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.jboss.logging.Logger; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java index 46f2c8addab9b..4aa932d0275b3 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java @@ -3,10 +3,10 @@ import java.util.List; import java.util.function.Function; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.jboss.logging.Logger; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java index a3e48e3668c9b..a98136cd2643d 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; /** * This interceptor binding is added at build time on a method if: diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java index cd09c01d4bba2..ae3aa1af9352a 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java @@ -1,6 +1,6 @@ package io.quarkus.cache.runtime; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.quarkus.cache.CacheManager; import io.quarkus.runtime.StartupEvent; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerRecorder.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerRecorder.java index e97a685ef9003..8350ca55c6b28 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerRecorder.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerRecorder.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import io.quarkus.cache.CacheManager; import io.quarkus.cache.runtime.caffeine.CaffeineCacheManagerBuilder; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java index a8d1cffc7e54f..fa3fc0d07e789 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java @@ -2,10 +2,10 @@ import java.lang.annotation.Annotation; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheManager; diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java index b16691a6ecb7f..dadc40e07d033 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java +++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java @@ -4,10 +4,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.jboss.logging.Logger; diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/FooResource.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/FooResource.java index dacc045c1276f..b618d43a2e869 100644 --- a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/FooResource.java +++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/FooResource.java @@ -1,9 +1,9 @@ package io.quarkus.config.yaml.deployment; -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.config.inject.ConfigProperty; diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java index efcda74d9f6eb..b63409d07999e 100644 --- a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java +++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfig.java b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfig.java index 399a673bb4d30..e4bac6a7c5d1b 100644 --- a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfig.java +++ b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfig.java @@ -76,9 +76,9 @@ public class CsrfReactiveConfig { * If this property is enabled then the input stream will be read and cached by the CSRF filter to verify the token. * * If you prefer then you can disable this property and compare - * CSRF form and cookie parameters in the application code using JAX-RS javax.ws.rs.FormParam which refers to the + * CSRF form and cookie parameters in the application code using JAX-RS jakarta.ws.rs.FormParam which refers to the * {@link #formFieldName} - * form property and javax.ws.rs.CookieParam which refers to the {@link CsrfReactiveConfig#cookieName} cookie. + * form property and jakarta.ws.rs.CookieParam which refers to the {@link CsrfReactiveConfig#cookieName} cookie. * * Note that even if the CSRF token verification in the CSRF filter is disabled, the filter will still perform checks to * ensure the token diff --git a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java index 29e7b1458c65c..0102266094961 100644 --- a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java +++ b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java @@ -3,12 +3,12 @@ import java.security.SecureRandom; import java.util.Base64; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfTokenParameterProvider.java b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfTokenParameterProvider.java index b84dd490da8de..85294cedf4c1e 100644 --- a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfTokenParameterProvider.java +++ b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfTokenParameterProvider.java @@ -1,8 +1,8 @@ package io.quarkus.csrf.reactive.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import io.vertx.ext.web.RoutingContext; @@ -48,4 +48,4 @@ public String getToken() { public String getParameterName() { return csrfFormFieldName; } -} \ No newline at end of file +} diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DataSourcesExcludedFromHealthChecksProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DataSourcesExcludedFromHealthChecksProcessor.java index 4a2bc100a952a..80b43e8033719 100644 --- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DataSourcesExcludedFromHealthChecksProcessor.java +++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DataSourcesExcludedFromHealthChecksProcessor.java @@ -2,7 +2,7 @@ import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; diff --git a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java index 23b80db7a5111..f05e8a728aea6 100644 --- a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java +++ b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.elasticsearch.client.RestClientBuilder; diff --git a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/TestResource.java b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/TestResource.java index 743a2cfb851a1..5a10c4ebb8d67 100644 --- a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/TestResource.java +++ b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/TestResource.java @@ -4,11 +4,11 @@ import java.util.ArrayList; 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.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.apache.http.util.EntityUtils; import org.elasticsearch.client.Request; diff --git a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java index 1af174c1e9bc8..a658039ab9a86 100644 --- a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java +++ b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Annotate implementations of {@code org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback} to provide further diff --git a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchRestClientProducer.java b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchRestClientProducer.java index 2a3260fcbd5d3..bbe796b9051b1 100644 --- a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchRestClientProducer.java +++ b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchRestClientProducer.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.io.UncheckedIOException; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; diff --git a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/health/ElasticsearchHealthCheck.java b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/health/ElasticsearchHealthCheck.java index 46001379905ce..d952600d65244 100644 --- a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/health/ElasticsearchHealthCheck.java +++ b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/health/ElasticsearchHealthCheck.java @@ -1,7 +1,7 @@ package io.quarkus.elasticsearch.restclient.lowlevel.runtime.health; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.http.util.EntityUtils; import org.eclipse.microprofile.health.HealthCheck; diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java b/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java index c69728bc3e39c..789b12460ab7b 100644 --- a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java +++ b/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java @@ -4,12 +4,12 @@ import java.io.UncheckedIOException; import java.util.Collections; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoder.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoder.java index 4971a596602f4..a98b538d8067f 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoder.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoder.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.StreamSupport; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.wildfly.security.authz.Attributes; import org.wildfly.security.authz.AuthorizationIdentity; diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/ParametrizedPathsResource.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/ParametrizedPathsResource.java index c79be49f172e8..483e2a02364e3 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/ParametrizedPathsResource.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/ParametrizedPathsResource.java @@ -1,9 +1,9 @@ package io.quarkus.elytron.security.jdbc; -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; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/RolesEndpointClassLevel.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/RolesEndpointClassLevel.java index 9ffbfcd94d136..430bd0b72ec88 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/RolesEndpointClassLevel.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/RolesEndpointClassLevel.java @@ -1,10 +1,10 @@ package io.quarkus.elytron.security.jdbc; -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; /** * Test JAXRS endpoint with RolesAllowed specified at the class level diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SingleRoleSecuredServlet.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SingleRoleSecuredServlet.java index 9f89abb22a255..df11ad4eee670 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SingleRoleSecuredServlet.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SingleRoleSecuredServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic secured servlet test target diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SubjectExposingResource.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SubjectExposingResource.java index ba6b1452ed6dc..6826d7a002181 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SubjectExposingResource.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/SubjectExposingResource.java @@ -2,14 +2,14 @@ import java.security.Principal; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -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.PermitAll; +import jakarta.annotation.security.RolesAllowed; +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; @Path("subject") public class SubjectExposingResource { diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/TestApplication.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/TestApplication.java index fd8cc93299986..9b114eebc04ce 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/TestApplication.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/TestApplication.java @@ -1,8 +1,8 @@ package io.quarkus.elytron.security.jdbc; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationScoped @ApplicationPath("/jaxrs-secured") diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoder.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoder.java index 9697832847407..bed410dbeac14 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoder.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/CustomRoleDecoder.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.stream.StreamSupport; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.wildfly.security.authz.Attributes; import org.wildfly.security.authz.AuthorizationIdentity; diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/ParametrizedPathsResource.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/ParametrizedPathsResource.java index 33d8be9dfdf78..c2e9f78a215ce 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/ParametrizedPathsResource.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/ParametrizedPathsResource.java @@ -1,9 +1,9 @@ package io.quarkus.elytron.security.ldap.rest; -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 ParametrizedPathsResource { diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/RolesEndpointClassLevel.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/RolesEndpointClassLevel.java index fc8e8f8b8ebed..32dcbd8881419 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/RolesEndpointClassLevel.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/RolesEndpointClassLevel.java @@ -1,10 +1,10 @@ package io.quarkus.elytron.security.ldap.rest; -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; /** * Test JAXRS endpoint with RolesAllowed specified at the class level diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SingleRoleSecuredServlet.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SingleRoleSecuredServlet.java index a9c6df3421306..06377067d4b5c 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SingleRoleSecuredServlet.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SingleRoleSecuredServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic secured servlet test target diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SubjectExposingResource.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SubjectExposingResource.java index 124a0a7f704e7..f54c4a300f88d 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SubjectExposingResource.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/SubjectExposingResource.java @@ -2,14 +2,14 @@ import java.security.Principal; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -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.PermitAll; +import jakarta.annotation.security.RolesAllowed; +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; @Path("subject") public class SubjectExposingResource { diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/TestApplication.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/TestApplication.java index 752efd59d42e6..93d1b19541927 100644 --- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/TestApplication.java +++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/rest/TestApplication.java @@ -1,8 +1,8 @@ package io.quarkus.elytron.security.ldap.rest; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationScoped @ApplicationPath("/jaxrs-secured") diff --git a/extensions/elytron-security-oauth2/deployment/src/main/java/io/quarkus/elytron/security/oauth2/deployment/OAuth2DeploymentProcessor.java b/extensions/elytron-security-oauth2/deployment/src/main/java/io/quarkus/elytron/security/oauth2/deployment/OAuth2DeploymentProcessor.java index 978eb2c002a6c..2c9f858563826 100644 --- a/extensions/elytron-security-oauth2/deployment/src/main/java/io/quarkus/elytron/security/oauth2/deployment/OAuth2DeploymentProcessor.java +++ b/extensions/elytron-security-oauth2/deployment/src/main/java/io/quarkus/elytron/security/oauth2/deployment/OAuth2DeploymentProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.elytron.security.oauth2.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.wildfly.security.auth.server.SecurityRealm; diff --git a/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2AuthMechanism.java b/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2AuthMechanism.java index 6e67cbbc7d66b..c61b680c29706 100644 --- a/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2AuthMechanism.java +++ b/extensions/elytron-security-oauth2/runtime/src/main/java/io/quarkus/elytron/security/oauth2/runtime/auth/OAuth2AuthMechanism.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpResponseStatus; diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuth.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuth.java index b6ff714b8710f..ba9653080aa06 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuth.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomAuth.java @@ -9,7 +9,7 @@ import java.util.Locale; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomRoleAccessResource.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomRoleAccessResource.java index 37ca1302d8c62..e93424668a9c2 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomRoleAccessResource.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/CustomRoleAccessResource.java @@ -2,12 +2,12 @@ import java.security.Principal; -import javax.annotation.security.RolesAllowed; -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.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("custom-role") public class CustomRoleAccessResource { diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/ParametrizedPathsResource.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/ParametrizedPathsResource.java index aa608206efdec..31cf1ee9025aa 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/ParametrizedPathsResource.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/ParametrizedPathsResource.java @@ -1,9 +1,9 @@ package io.quarkus.security.test; -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; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/RolesEndpointClassLevel.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/RolesEndpointClassLevel.java index 5b4e84e012427..af586599a7928 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/RolesEndpointClassLevel.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/RolesEndpointClassLevel.java @@ -1,10 +1,10 @@ package io.quarkus.security.test; -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; /** * Test JAXRS endpoint with RolesAllowed specified at the class level diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/SubjectExposingResource.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/SubjectExposingResource.java index b8f484e8ec1e4..6486c5274352b 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/SubjectExposingResource.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/SubjectExposingResource.java @@ -2,14 +2,14 @@ import java.security.Principal; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -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.PermitAll; +import jakarta.annotation.security.RolesAllowed; +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; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com @@ -59,4 +59,4 @@ public String getSubjectDenied(@Context SecurityContext sec) { String name = user != null ? user.getName() : "anonymous"; return name; } -} \ No newline at end of file +} diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestApplication.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestApplication.java index 909d4ad45a662..de064a7942259 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestApplication.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestApplication.java @@ -1,8 +1,8 @@ package io.quarkus.security.test; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationScoped @ApplicationPath("/jaxrs-secured") diff --git a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestSecureServlet.java b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestSecureServlet.java index c589eb74e1788..9f74f8fe4f2d7 100644 --- a/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestSecureServlet.java +++ b/extensions/elytron-security-properties-file/deployment/src/test/java/io/quarkus/security/test/TestSecureServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic secured servlet test target diff --git a/extensions/elytron-security-properties-file/runtime/pom.xml b/extensions/elytron-security-properties-file/runtime/pom.xml index e3b6f020ce1b0..1fff93e0a6590 100644 --- a/extensions/elytron-security-properties-file/runtime/pom.xml +++ b/extensions/elytron-security-properties-file/runtime/pom.xml @@ -57,12 +57,12 @@ jakarta.enterprise.cdi-api - jakarta.security.jacc - jakarta.security.jacc-api + jakarta.authorization + jakarta.authorization-api - jakarta.security.auth.message - jakarta.security.auth.message-api + jakarta.authentication + jakarta.authentication-api diff --git a/extensions/elytron-security/runtime/pom.xml b/extensions/elytron-security/runtime/pom.xml index 7a6c2bf98b103..f72f64b88ff00 100644 --- a/extensions/elytron-security/runtime/pom.xml +++ b/extensions/elytron-security/runtime/pom.xml @@ -60,12 +60,12 @@ jakarta.enterprise.cdi-api - jakarta.security.jacc - jakarta.security.jacc-api + jakarta.authorization + jakarta.authorization-api - jakarta.security.auth.message - jakarta.security.auth.message-api + jakarta.authentication + jakarta.authentication-api io.quarkus diff --git a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/DefaultRoleDecoder.java b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/DefaultRoleDecoder.java index 4e8b6ffd400aa..eb9dd2c431aeb 100644 --- a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/DefaultRoleDecoder.java +++ b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/DefaultRoleDecoder.java @@ -4,10 +4,10 @@ import java.util.HashSet; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.wildfly.security.authz.Attributes; diff --git a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPasswordIdentityProvider.java b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPasswordIdentityProvider.java index f46861159196b..5118f6b612034 100644 --- a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPasswordIdentityProvider.java +++ b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPasswordIdentityProvider.java @@ -2,8 +2,8 @@ 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.jboss.logging.Logger; import org.wildfly.security.auth.server.RealmUnavailableException; diff --git a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronRecorder.java b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronRecorder.java index a2ebff71bc80e..70e68707ef4a9 100644 --- a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronRecorder.java +++ b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronRecorder.java @@ -2,7 +2,7 @@ import java.security.Permission; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; import org.wildfly.security.auth.server.RealmMapper; diff --git a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronSecurityDomainManager.java b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronSecurityDomainManager.java index 16e2c59100c08..6d1d0a625bff0 100644 --- a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronSecurityDomainManager.java +++ b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronSecurityDomainManager.java @@ -1,7 +1,7 @@ package io.quarkus.elytron.security.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.wildfly.security.auth.server.SecurityDomain; diff --git a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTokenIdentityProvider.java b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTokenIdentityProvider.java index 4ab58334f261c..9c913152b2a89 100644 --- a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTokenIdentityProvider.java +++ b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTokenIdentityProvider.java @@ -2,8 +2,8 @@ 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.jboss.logging.Logger; import org.wildfly.security.auth.server.RealmUnavailableException; diff --git a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTrustedIdentityProvider.java b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTrustedIdentityProvider.java index d5e1a1e6fd341..314d2492e2785 100644 --- a/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTrustedIdentityProvider.java +++ b/extensions/elytron-security/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronTrustedIdentityProvider.java @@ -2,8 +2,8 @@ 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.jboss.logging.Logger; import org.wildfly.security.auth.server.RealmIdentity; diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java index 4ab0a4203ff54..fb2909b73b8ec 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java @@ -18,8 +18,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Default; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Default; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.Location; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/DevModeTestEndpoint.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/DevModeTestEndpoint.java index 53d36b3f80504..496d61e1ca676 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/DevModeTestEndpoint.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/DevModeTestEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.flyway.test; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.flywaydb.core.Flyway; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java index 63e85e3c533ea..a9d30c5362216 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.function.Function; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.CoreMatchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeModifyMigrationTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeModifyMigrationTest.java index 51fd003dd2805..b2a407536956b 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeModifyMigrationTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeModifyMigrationTest.java @@ -8,9 +8,9 @@ import java.sql.Statement; import java.util.function.Function; -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 org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java index e316ab7e9b211..5b21636867b7b 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java index cf4a555038b4a..96eae7ac51708 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCDICallback.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCDICallback.java index 73a6bdbf9f470..d80b9f8c0be76 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCDICallback.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCDICallback.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.List; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.callback.Callback; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java index 18e7fb48d7f3e..43422e9923b2c 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java @@ -9,7 +9,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java index fd0ca9159bf5b..140f9bb5eda76 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java @@ -8,7 +8,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.h2.jdbc.JdbcSQLSyntaxErrorException; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java index b491b69b54d91..8b1f25d96663c 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartWithJavaMigrationTest.java @@ -8,7 +8,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationVersion; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java index 72b9944c89a9f..47083ba671a51 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAtStartTest.java @@ -8,7 +8,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java index 0ce8f0c6ee495..eca8ae357d7e0 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java index 4153bca4a8707..04fed955e4bd8 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceWithoutFlywayTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java index ad2021699d337..d5f680c6d9ef6 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigEmptyTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java index 06995fe92d44c..54e6680272594 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java @@ -6,8 +6,8 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.flywaydb.core.Flyway; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java index c02d987a45335..af5c7cca818f5 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMissingNamedDataSourceTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java index 6d4ce974f2662..3396fb7382bff 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java index 3795a64ab20d7..a009f2126823b 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java index c17e8149e3b66..9383d79337634 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java index a313404927752..747677ef9e214 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutFlywayTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java index 49d761832b0ae..7d33b3491df1f 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java @@ -9,7 +9,7 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationVersion; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java index d0ca6e2dbe7a1..f701d2391c6af 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionInitSqlTest.java @@ -7,9 +7,10 @@ import java.sql.ResultSet; import java.sql.SQLException; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.inject.Inject; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java index fc473ae613f5e..95db9554486c4 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartNamedDataSourceTest.java @@ -3,7 +3,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.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java index 691a994acb227..07124ffe392b0 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java @@ -3,7 +3,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.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java index d7ec0171b3e7c..461ef4438d4d7 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java @@ -3,7 +3,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.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java index 695d72326c2a4..448dcd01a605e 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.TimeUnit; -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 org.flywaydb.core.Flyway; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithCustomizerTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithCustomizerTest.java index a1eeaa5832af0..72a5421f080ca 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithCustomizerTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithCustomizerTest.java @@ -8,8 +8,8 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.flywaydb.core.api.configuration.FluentConfiguration; import org.junit.jupiter.api.Test; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithMultipleDatasourcesAndCustomizersTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithMultipleDatasourcesAndCustomizersTest.java index 24a35bb5b11ce..8cce50403573c 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithMultipleDatasourcesAndCustomizersTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionWithMultipleDatasourcesAndCustomizersTest.java @@ -8,9 +8,9 @@ import java.sql.SQLException; import java.sql.Statement; -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.flywaydb.core.api.configuration.FluentConfiguration; import org.junit.jupiter.api.Test; diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/Fruit.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/Fruit.java index ea2c34b0fbb2c..fa416d1d30f7b 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/Fruit.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/Fruit.java @@ -1,9 +1,9 @@ package io.quarkus.flyway.test; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Fruit { diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/MultiDataSourcesDevModeEndpoint.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/MultiDataSourcesDevModeEndpoint.java index a4beccf452d72..2b5634b4df4ed 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/MultiDataSourcesDevModeEndpoint.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/MultiDataSourcesDevModeEndpoint.java @@ -3,12 +3,12 @@ import java.util.Arrays; import java.util.stream.Collectors; -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 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 org.flywaydb.core.Flyway; import org.flywaydb.core.api.Location; diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/FlywayDataSource.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/FlywayDataSource.java index ba4229d4e67bf..1962087461c5a 100644 --- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/FlywayDataSource.java +++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/FlywayDataSource.java @@ -10,9 +10,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Named; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Named; +import jakarta.inject.Qualifier; /** * Qualifier used to specify which datasource will be used and therefore which Flyway instance will be injected. @@ -57,4 +57,4 @@ public String toString() { return "FlywayDataSourceLiteral [value=" + value + "]"; } } -} \ No newline at end of file +} diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java index 6c5acb799b95d..94c7919fe4615 100644 --- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java +++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java @@ -6,9 +6,10 @@ import java.util.Map; import java.util.function.Supplier; -import javax.enterprise.inject.UnsatisfiedResolutionException; import javax.sql.DataSource; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; + import org.flywaydb.core.Flyway; import org.flywaydb.core.api.callback.Callback; import org.flywaydb.core.api.migration.JavaMigration; diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java index 8c6a5b24ebaca..0e01f030363cc 100644 --- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java +++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/ProcessingService.java @@ -1,6 +1,6 @@ package ${package}; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProcessingService { diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestFunq.java b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestFunq.java index a2003020c071a..04c38761b5dd7 100644 --- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestFunq.java +++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/TestFunq.java @@ -1,6 +1,6 @@ package ${package}; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.funqy.Funq; public class TestFunq { diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedFunq.java b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedFunq.java index 7fbf033a19124..e936a1e34885d 100644 --- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedFunq.java +++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/main/java/UnusedFunq.java @@ -1,6 +1,6 @@ package ${package}; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.funqy.Funq; public class UnusedFunq { diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java index 1bab3bc381945..55896c5153e05 100644 --- a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java +++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.funqy.Funq; import io.smallrye.mutiny.Uni; diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java index 5f20bdb0a7ab0..3ad7c6dc10bd5 100644 --- a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java +++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java b/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java index eb918f79755be..ae54f23d3ce5a 100644 --- a/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java +++ b/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java @@ -3,8 +3,8 @@ import java.io.InputStream; import java.util.concurrent.Executor; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java index a011852d793c4..4376750399482 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java @@ -4,7 +4,7 @@ import java.util.Timer; import java.util.TimerTask; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.funqy.Funq; import io.smallrye.mutiny.Uni; diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java index 5f20bdb0a7ab0..3ad7c6dc10bd5 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeLeakTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeLeakTest.java index 2c2c8f62b7e8a..f56e5968b8727 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeLeakTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeLeakTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeTest.java index 01d51b8b9b033..59b84b0650ca9 100644 --- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeTest.java +++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RequestScopeTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java index eb172090110f0..4f898ca78efd7 100644 --- a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java +++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java @@ -23,8 +23,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java b/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java index aa60c6dc782aa..4d63d8ca85754 100644 --- a/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java +++ b/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java @@ -18,7 +18,7 @@ private ReflectionRegistrationUtil() { static final IgnoreMethodForReflectionPredicate IGNORE_METHOD_FOR_REFLECTION_PREDICATE = new IgnoreMethodForReflectionPredicate(); private static final DotName JSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore"); - private static final DotName JSONB_TRANSIENT = DotName.createSimple("javax.json.bind.annotation.JsonbTransient"); + private static final DotName JSONB_TRANSIENT = DotName.createSimple("jakarta.json.bind.annotation.JsonbTransient"); private static class IgnoreTypeForReflectionPredicate implements Predicate { diff --git a/extensions/funqy/funqy-server-common/deployment/src/test/java/io/quarkus/funqy/deployment/DependencyInjectionTest.java b/extensions/funqy/funqy-server-common/deployment/src/test/java/io/quarkus/funqy/deployment/DependencyInjectionTest.java index dcd6aebb47cd6..c1cbc53cde929 100644 --- a/extensions/funqy/funqy-server-common/deployment/src/test/java/io/quarkus/funqy/deployment/DependencyInjectionTest.java +++ b/extensions/funqy/funqy-server-common/deployment/src/test/java/io/quarkus/funqy/deployment/DependencyInjectionTest.java @@ -1,8 +1,8 @@ package io.quarkus.funqy.deployment; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java b/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java index 39b31dc51359c..08db4e6356a8b 100644 --- a/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java +++ b/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/GoogleCloudFunctionsProcessor.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Named; +import jakarta.inject.Named; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionsConfig.java b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionsConfig.java index 237d63a94d9f5..7e9d4229e3a7c 100644 --- a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionsConfig.java +++ b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionsConfig.java @@ -9,7 +9,7 @@ @ConfigRoot(phase = ConfigPhase.RUN_TIME) public class GoogleCloudFunctionsConfig { /** - * The function name. Function names are specified on function classes using the {@link @javax.inject.Named} annotation. + * The function name. Function names are specified on function classes using the {@link @jakarta.inject.Named} annotation. * * If this name is unspecified and there is exactly one unnamed function then this unnamed function will be used. * If there is only a single named function and the name is unspecified then the named function will be used. diff --git a/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/Generated.java b/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/Generated.java index f46c523ed4656..1c744b8fd5102 100644 --- a/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/Generated.java +++ b/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/Generated.java @@ -15,10 +15,10 @@ /** * The {@code @Generated} annotation is used to mark source code that has been generated during the gRPC generation phase. - * Classes generated by {@code protoc} are post-processed to remove the {@code javax.annotation.Generated} and use + * Classes generated by {@code protoc} are post-processed to remove the {@code jakarta.annotation.Generated} and use * this annotation instead, avoiding a dependency on a pre-jakarta annotation. * - * This class is a direct copy of {@code javax.annotation.Generated}. + * This class is a direct copy of {@code jakarta.annotation.Generated}. */ @Documented @Retention(SOURCE) diff --git a/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClient.java b/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClient.java index 016df6b54627c..dbc907d4ca0d5 100644 --- a/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClient.java +++ b/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClient.java @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Qualifies an injected gRPC client. diff --git a/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcService.java b/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcService.java index 0f2b5f15af94e..c2b9c81e7356f 100644 --- a/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcService.java +++ b/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcService.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Qualifies a gRPC service. diff --git a/extensions/grpc/api/src/main/java/io/quarkus/grpc/RegisterClientInterceptor.java b/extensions/grpc/api/src/main/java/io/quarkus/grpc/RegisterClientInterceptor.java index 372a57b62d086..1337ce7b6d944 100644 --- a/extensions/grpc/api/src/main/java/io/quarkus/grpc/RegisterClientInterceptor.java +++ b/extensions/grpc/api/src/main/java/io/quarkus/grpc/RegisterClientInterceptor.java @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; import io.grpc.ClientInterceptor; diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java index b1263d9e1afff..8d63f6e75057f 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java @@ -20,9 +20,9 @@ import java.util.function.Consumer; import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java index b59cafd4d8ebe..8a59a56b0fb95 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java @@ -38,7 +38,7 @@ public class GrpcDotNames { public static final DotName BLOCKING = DotName.createSimple(Blocking.class.getName()); public static final DotName NON_BLOCKING = DotName.createSimple(NonBlocking.class.getName()); - public static final DotName TRANSACTIONAL = DotName.createSimple("javax.transaction.Transactional"); + public static final DotName TRANSACTIONAL = DotName.createSimple("jakarta.transaction.Transactional"); public static final DotName ABSTRACT_BLOCKING_STUB = DotName.createSimple(AbstractBlockingStub.class.getName()); public static final DotName MUTINY_STUB = DotName.createSimple(MutinyStub.class.getName()); diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java index 2e3753c823301..eb2874ecf541a 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java @@ -20,8 +20,8 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.transaction.Transaction; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.transaction.Transaction; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; @@ -305,7 +305,7 @@ private static BlockingMode inheritedBlockingMode(Predicate checker, * ({@link io.smallrye.common.annotation.Blocking} or {@link io.smallrye.common.annotation.NonBlocking}). * *

- * Otherwise returns the "topmost" "non-explicit" annotation (aka {@link javax.transaction.Transactional}). + * Otherwise returns the "topmost" "non-explicit" annotation (aka {@link jakarta.transaction.Transactional}). */ private static boolean methodIsBlocking(List classes, String methodName, Type[] methodArgs) { BlockingMode classModeInherited = BlockingMode.UNDEFINED; @@ -480,7 +480,7 @@ private void validateBindableService(BeanInfo bean, Type generatedBeanType, } if (!bean.getScope().getDotName().equals(BuiltinScope.SINGLETON.getName())) { errors.produce(new ValidationPhaseBuildItem.ValidationErrorBuildItem( - new IllegalStateException("A gRPC service bean must have the javax.inject.Singleton scope: " + bean))); + new IllegalStateException("A gRPC service bean must have the jakarta.inject.Singleton scope: " + bean))); } } diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devmode/GrpcDevConsoleProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devmode/GrpcDevConsoleProcessor.java index d3c48c0da19e7..e9071e73b62f6 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devmode/GrpcDevConsoleProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devmode/GrpcDevConsoleProcessor.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/auth/GrpcAuthTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/auth/GrpcAuthTest.java index b73d71e2c7604..4b02bd8ce4f7d 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/auth/GrpcAuthTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/auth/GrpcAuthTest.java @@ -12,8 +12,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.security.RolesAllowed; -import javax.inject.Singleton; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/BlockingStubInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/BlockingStubInjectionTest.java index a2e0938f68152..c57a0bccdb3c9 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/BlockingStubInjectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/BlockingStubInjectionTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ChannelInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ChannelInjectionTest.java index 98b485108193d..3da0b2c7b3ddd 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ChannelInjectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ChannelInjectionTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientServiceInterfaceCompressionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientServiceInterfaceCompressionTest.java index c4cd152fa99c3..34d37b25562dd 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientServiceInterfaceCompressionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientServiceInterfaceCompressionTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientStubCompressionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientStubCompressionTest.java index 47445be8f071e..d7ff52dc44190 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientStubCompressionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/ClientStubCompressionTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InstanceInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InstanceInjectionTest.java index 0acb1f1135160..bca8216a4f3a6 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InstanceInjectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InstanceInjectionTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java index 79e1539e17181..acf1939121c28 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/InvalidInjectionTypeTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MultipleStubsInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MultipleStubsInjectionTest.java index 62aa983bd64f4..25b4569c7faf1 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MultipleStubsInjectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MultipleStubsInjectionTest.java @@ -4,8 +4,8 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionFailureTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionFailureTest.java index be2bc69ca38be..c7c4f24370f21 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionFailureTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionFailureTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionTest.java index b6ae1d2dc51d4..9cb2012f75fb2 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionTest.java @@ -4,8 +4,8 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java index 31ea175e08ad4..a3cf817593051 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java @@ -4,8 +4,8 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/deadline/ClientDeadlineTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/deadline/ClientDeadlineTest.java index 63ea795c5689f..3dc5af1cbd5b0 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/deadline/ClientDeadlineTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/deadline/ClientDeadlineTest.java @@ -5,8 +5,8 @@ import java.time.Duration; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyFirstClientInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyFirstClientInterceptor.java index 24091f43b6019..3184b43015f47 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyFirstClientInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyFirstClientInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.client.interceptors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyLastClientInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyLastClientInterceptor.java index adfacbbdc4aba..f52744201abb8 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyLastClientInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyLastClientInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.client.interceptors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MySecondClientInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MySecondClientInterceptor.java index 74fd6e2660163..5d31be71ef409 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MySecondClientInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MySecondClientInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.client.interceptors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyThirdClientInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyThirdClientInterceptor.java index 57fec96ad488f..5d4b8cc81d113 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyThirdClientInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/interceptors/MyThirdClientInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.client.interceptors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java index b141a022c2628..257f696220444 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.grpc.client.tls; -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.grpc.examples.helloworld.GreeterGrpc; import io.grpc.examples.helloworld.HelloReply; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/deployment/GrpcServerProcessorTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/deployment/GrpcServerProcessorTest.java index 2c416a3e594f5..6a0896add0cb0 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/deployment/GrpcServerProcessorTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/deployment/GrpcServerProcessorTest.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.stream.Stream; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcHealthTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcHealthTest.java index 2beb229323c96..5e5c8e9593044 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcHealthTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcHealthTest.java @@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcReflectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcReflectionTest.java index 1e748b893d4ce..80d495f1e33ae 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcReflectionTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcReflectionTest.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; +import java.util.concurrent.Flow; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -12,8 +13,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; import com.google.protobuf.ByteString; @@ -233,15 +232,15 @@ public void testRetrievingAllExtensionNumbersOfType() { assertThat(list).containsExactlyInAnyOrderElementsOf(expected); } - private static class ResettableSubscriber implements Subscriber { + private static class ResettableSubscriber implements Flow.Subscriber { - private Subscription subscription; + private Flow.Subscription subscription; private volatile T last; private boolean completed; private Throwable failure; @Override - public void onSubscribe(Subscription subscription) { + public void onSubscribe(Flow.Subscription subscription) { this.subscription = subscription; } diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java index 97f5ae868184e..e3dafe6ea13bf 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/GrpcServerTest.java @@ -4,9 +4,9 @@ import java.util.stream.Collectors; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java index d966ff48d942d..804f52d2097a5 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnClassTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnClassTest.java index 382a5f0b94fe3..91608a7b89ee0 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnClassTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnClassTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -52,4 +52,4 @@ public Uni returnThread2(com.dam.Blocking.Empty req com.dam.Blocking.ThreadName.newBuilder().setName(message).build()); } } -} \ No newline at end of file +} diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnMethodTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnMethodTest.java index d33ad2e788021..fba1916ad90d7 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnMethodTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingConfusingOnMethodTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java index 5623d865b9f25..828c4e96df90e 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/TransactionalAsBlockingTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/TransactionalAsBlockingTest.java index 7393f39b8e08f..72b3aaf980ede 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/TransactionalAsBlockingTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/TransactionalAsBlockingTest.java @@ -4,7 +4,7 @@ import java.time.Duration; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/inheritance/BlockingFromTransactionalTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/inheritance/BlockingFromTransactionalTest.java index fffe21c01be69..a1f791a387b74 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/inheritance/BlockingFromTransactionalTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/inheritance/BlockingFromTransactionalTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServiceCallingResource.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServiceCallingResource.java index 29aa18ae02207..291a895cba5ff 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServiceCallingResource.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeServiceCallingResource.java @@ -2,8 +2,8 @@ import java.time.Duration; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import devmodetest.v1.DevModeService; import devmodetest.v1.Devmodetest; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestInterceptor.java index 392e8861c3e61..36c1273c2b833 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestInterceptor.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.server.devmode; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.grpc.ForwardingServerCall; import io.grpc.Metadata; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestRestResource.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestRestResource.java index 7283367806fe9..5812798c3f1aa 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestRestResource.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestRestResource.java @@ -1,11 +1,11 @@ package io.quarkus.grpc.server.devmode; -import javax.inject.Inject; -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.inject.Inject; +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; @Path("/test") @Consumes(MediaType.TEXT_PLAIN) diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestService.java index 9e1c701fd2455..38342eb19371d 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestService.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/DevModeTestService.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.server.devmode; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import devmodetest.v1.Devmodetest; import io.grpc.examples.helloworld.GreeterGrpc; @@ -29,4 +29,4 @@ public void sayHello(HelloRequest request, StreamObserver responseOb } responseObserver.onCompleted(); } -} \ No newline at end of file +} diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/IsUpEndpoint.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/IsUpEndpoint.java index 5dcb55086e1c3..8ae2ed770b46b 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/IsUpEndpoint.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/IsUpEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.grpc.server.devmode; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.quarkus.grpc.runtime.GrpcServerRecorder; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInInterceptorTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInInterceptorTest.java index 77b3f250683fd..35e46d90cf292 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInInterceptorTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInInterceptorTest.java @@ -4,7 +4,7 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInterceptorTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInterceptorTest.java index 2db87eba423da..8b18819dee161 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInterceptorTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/FailingInterceptorTest.java @@ -4,7 +4,7 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/GlobalAndServiceInterceptorsTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/GlobalAndServiceInterceptorsTest.java index 111dde25faf40..1787f47d18ada 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/GlobalAndServiceInterceptorsTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/GlobalAndServiceInterceptorsTest.java @@ -4,7 +4,7 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MyFirstInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MyFirstInterceptor.java index bee9dba9d37bc..f9c00822d94a1 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MyFirstInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MyFirstInterceptor.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.Context; import io.grpc.Contexts; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MySecondInterceptor.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MySecondInterceptor.java index eb93fb52f78ac..7df550672cd86 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MySecondInterceptor.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/MySecondInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.server.interceptors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.ForwardingServerCall; import io.grpc.Metadata; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityReversedTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityReversedTest.java index 789ebaa394df9..100635ee338ea 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityReversedTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityReversedTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityTest.java index 513584414039b..f64a5b522ed5a 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorPriorityTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorProducerTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorProducerTest.java index 01d0d0a129177..11342326945d1 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorProducerTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorProducerTest.java @@ -3,9 +3,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; -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.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorRegistrationTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorRegistrationTest.java index ce659ffa89489..cc2ea0da96732 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorRegistrationTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/interceptors/ServerInterceptorRegistrationTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/grpc/protoc/src/main/resources/MutinyBean.mustache b/extensions/grpc/protoc/src/main/resources/MutinyBean.mustache index ac6e65301832e..dc104a738f8ea 100644 --- a/extensions/grpc/protoc/src/main/resources/MutinyBean.mustache +++ b/extensions/grpc/protoc/src/main/resources/MutinyBean.mustache @@ -6,7 +6,7 @@ import io.grpc.BindableService; import io.quarkus.grpc.GrpcService; import io.quarkus.grpc.MutinyBean; -@javax.annotation.Generated( +@jakarta.annotation.Generated( value = "by {{classPrefix}} Grpc generator", comments = "Source: {{protoName}}") public class {{serviceName}}Bean extends {{className}}.{{serviceName}}ImplBase implements BindableService, MutinyBean { diff --git a/extensions/grpc/protoc/src/main/resources/MutinyClient.mustache b/extensions/grpc/protoc/src/main/resources/MutinyClient.mustache index 07064f661e80d..d7fe565824524 100644 --- a/extensions/grpc/protoc/src/main/resources/MutinyClient.mustache +++ b/extensions/grpc/protoc/src/main/resources/MutinyClient.mustache @@ -6,7 +6,7 @@ import java.util.function.BiFunction; import io.quarkus.grpc.MutinyClient; -@javax.annotation.Generated( +@jakarta.annotation.Generated( value = "by {{classPrefix}} Grpc generator", comments = "Source: {{protoName}}") public class {{serviceName}}Client implements {{serviceName}}, MutinyClient<{{classPrefix}}{{serviceName}}Grpc.{{classPrefix}}{{serviceName}}Stub> { diff --git a/extensions/grpc/protoc/src/main/resources/MutinyInterface.mustache b/extensions/grpc/protoc/src/main/resources/MutinyInterface.mustache index 83fa0f922e720..3cd96f2cc7e10 100644 --- a/extensions/grpc/protoc/src/main/resources/MutinyInterface.mustache +++ b/extensions/grpc/protoc/src/main/resources/MutinyInterface.mustache @@ -4,7 +4,7 @@ package {{packageName}}; import io.quarkus.grpc.MutinyService; -@javax.annotation.Generated( +@jakarta.annotation.Generated( value = "by {{classPrefix}} Grpc generator", comments = "Source: {{protoName}}") public interface {{serviceName}} extends MutinyService { diff --git a/extensions/grpc/protoc/src/main/resources/MutinyStub.mustache b/extensions/grpc/protoc/src/main/resources/MutinyStub.mustache index a7f27ee291e80..9b1d9391b3fb8 100644 --- a/extensions/grpc/protoc/src/main/resources/MutinyStub.mustache +++ b/extensions/grpc/protoc/src/main/resources/MutinyStub.mustache @@ -11,7 +11,7 @@ import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall; {{#deprecated}} @java.lang.Deprecated {{/deprecated}} -@javax.annotation.Generated( +@jakarta.annotation.Generated( value = "by {{classPrefix}} Grpc generator", comments = "Source: {{protoName}}") public final class {{className}} implements io.quarkus.grpc.MutinyGrpc { diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandler.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandler.java index a94224cfb9a80..115bee8b47879 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandler.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandler.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.auth; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandlerProvider.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandlerProvider.java index 2d4e0f4792ad3..f120d33b87056 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandlerProvider.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/AuthExceptionHandlerProvider.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.auth; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/DefaultAuthExceptionHandlerProvider.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/DefaultAuthExceptionHandlerProvider.java index db0600c2a1565..e762ce3184607 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/DefaultAuthExceptionHandlerProvider.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/DefaultAuthExceptionHandlerProvider.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.auth; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/GrpcSecurityInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/GrpcSecurityInterceptor.java index 259ef106ac967..c7586173caebb 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/GrpcSecurityInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/auth/GrpcSecurityInterceptor.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.concurrent.Executor; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.Prioritized; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.Prioritized; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java index 04bd951dc961c..b686947c0adfe 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.grpc.ClientInterceptor; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcContainer.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcContainer.java index 5f4ca57711534..91e145703aac4 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcContainer.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcContainer.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import io.grpc.BindableService; import io.grpc.ServerInterceptor; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java index a322d25b3d8ee..162190eb28322 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/Interceptors.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/Interceptors.java index 4f371baa55ff1..559944d23e72a 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/Interceptors.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/Interceptors.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.Prioritized; import io.quarkus.arc.Arc; import io.quarkus.arc.InstanceHandle; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/CollectStreams.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/CollectStreams.java index 31dd15d5af10a..561d6d20c42d4 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/CollectStreams.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/CollectStreams.java @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; /** * diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServices.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServices.java index a389c25d53061..ce3e554f1397b 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServices.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServices.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import grpc.health.v1.HealthOuterClass.HealthCheckResponse.ServingStatus; import io.grpc.MethodDescriptor.MethodType; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/StreamCollectorInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/StreamCollectorInterceptor.java index f0044724e93b5..6b11467d6fe90 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/StreamCollectorInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/StreamCollectorInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.grpc.runtime.devmode; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.grpc.stub.ServerCallStreamObserver; import io.grpc.stub.StreamObserver; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthCheck.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthCheck.java index 6692552618be7..763de679f0436 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthCheck.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthCheck.java @@ -2,8 +2,8 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthEndpoint.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthEndpoint.java index f76df3363ebb7..39c6d9bd95ae5 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthEndpoint.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthEndpoint.java @@ -3,8 +3,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import grpc.health.v1.HealthOuterClass; import grpc.health.v1.HealthOuterClass.HealthCheckResponse.ServingStatus; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthStorage.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthStorage.java index d2c3efd0a6e46..93296a00cac49 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthStorage.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/health/GrpcHealthStorage.java @@ -5,8 +5,8 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import grpc.health.v1.HealthOuterClass.HealthCheckResponse; import grpc.health.v1.HealthOuterClass.HealthCheckResponse.ServingStatus; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/stork/StorkMeasuringGrpcInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/stork/StorkMeasuringGrpcInterceptor.java index 5ae82a966ff0b..3dc8716b501cc 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/stork/StorkMeasuringGrpcInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/stork/StorkMeasuringGrpcInterceptor.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java index 200ce9314138f..542c9f32e5726 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import org.jboss.logging.Logger; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/GrpcClientConfigProvider.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/GrpcClientConfigProvider.java index 062b4d85dec9b..c0438f63e0510 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/GrpcClientConfigProvider.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/GrpcClientConfigProvider.java @@ -5,8 +5,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.grpc.stub.AbstractStub; import io.quarkus.arc.Arc; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java index 6102729883a50..a8aabb2d54022 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.runtime.supports; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java index ae45cba61ede6..e02cf3001f172 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java @@ -7,9 +7,9 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; +import jakarta.inject.Inject; import org.jboss.logging.Logger; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcRequestContextGrpcInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcRequestContextGrpcInterceptor.java index a797e52305dbb..af46d32a51268 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcRequestContextGrpcInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcRequestContextGrpcInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.runtime.supports.context; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; import org.jboss.logging.Logger; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/DefaultExceptionHandlerProvider.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/DefaultExceptionHandlerProvider.java index 2c7823943e66b..07b4513a64dca 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/DefaultExceptionHandlerProvider.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/DefaultExceptionHandlerProvider.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.runtime.supports.exc; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/ExceptionInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/ExceptionInterceptor.java index 13aaadfc27c94..8338614455294 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/ExceptionInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/exc/ExceptionInterceptor.java @@ -1,8 +1,8 @@ package io.quarkus.grpc.runtime.supports.exc; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Prioritized; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Prioritized; +import jakarta.inject.Inject; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/extensions/hal/runtime/pom.xml b/extensions/hal/runtime/pom.xml index 50319b6dc1721..7e5ca0cd3df41 100644 --- a/extensions/hal/runtime/pom.xml +++ b/extensions/hal/runtime/pom.xml @@ -22,8 +22,8 @@ quarkus-arc - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api io.quarkus diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapper.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapper.java index 6b1bcb8f64100..1a0caa75f83b5 100644 --- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapper.java +++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapper.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; /** * The Hal collection wrapper that includes the list of Hal entities {@link HalEntityWrapper}, the collection name and the Hal diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapperJsonbSerializer.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapperJsonbSerializer.java index c12e137b805d0..16ab71e68eafd 100644 --- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapperJsonbSerializer.java +++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalCollectionWrapperJsonbSerializer.java @@ -1,8 +1,8 @@ package io.quarkus.hal; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; public class HalCollectionWrapperJsonbSerializer implements JsonbSerializer { diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapper.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapper.java index 24b3a1e6b0852..c908213f4dab5 100644 --- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapper.java +++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapper.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; /** * The Hal entity wrapper that includes the entity and the Hal links. diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java index 8133180e8c0ac..990febd478606 100644 --- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java +++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java @@ -2,9 +2,9 @@ import java.util.Map; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; import org.eclipse.yasson.internal.ProcessingContext; import org.eclipse.yasson.internal.model.ClassModel; diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalLinkJsonbSerializer.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalLinkJsonbSerializer.java index f4759eb53bf99..60fd49d43e2a5 100644 --- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalLinkJsonbSerializer.java +++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalLinkJsonbSerializer.java @@ -1,8 +1,8 @@ package io.quarkus.hal; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; public class HalLinkJsonbSerializer implements JsonbSerializer { diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalWrapper.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalWrapper.java index 80d5953b21f2b..16338be4d3aea 100644 --- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalWrapper.java +++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalWrapper.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; public abstract class HalWrapper { diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/AbstractEnversResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/AbstractEnversResource.java index ff25a02708dc0..c784bb37fa34d 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/AbstractEnversResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/AbstractEnversResource.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.envers; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.UserTransaction; import org.hibernate.envers.boot.internal.EnversService; import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationPerPUTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationPerPUTest.java index fa9a0d78024dd..b19f5066bac18 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationPerPUTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationPerPUTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.envers.boot.internal.EnversService; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationTest.java index e77431faa99f7..155a3f5eab2fa 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversConfigurationTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.envers.boot.internal.EnversService; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java index b85d1dc123544..d6148c030447e 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.envers; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestAuditTableSuffixResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestAuditTableSuffixResource.java index a9a981522c35a..54de9dd23f690 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestAuditTableSuffixResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestAuditTableSuffixResource.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.envers; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.hibernate.envers.boot.internal.EnversService; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java index fead8b7164435..282b529ec8f30 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.resource.spi.IllegalStateException; -import javax.transaction.UserTransaction; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.resource.spi.IllegalStateException; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java index 1f23138f3ef44..9b18d539bbbce 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.resource.spi.IllegalStateException; -import javax.transaction.UserTransaction; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.resource.spi.IllegalStateException; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedEntity.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedEntity.java index 4ada528c36186..467f0805aa001 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedEntity.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers; -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; import org.hibernate.envers.Audited; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedVersionEntity.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedVersionEntity.java index ee34d72c4752b..2c7c49f5b8caa 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedVersionEntity.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyAuditedVersionEntity.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.envers; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.envers.Audited; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyListenerlessRevisionEntity.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyListenerlessRevisionEntity.java index 2c5d8d5bfa6bd..6fb28f2380fda 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyListenerlessRevisionEntity.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyListenerlessRevisionEntity.java @@ -2,12 +2,12 @@ import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.RevisionNumber; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyRevisionEntity.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyRevisionEntity.java index 1993a8e74a807..e9b9e848bde20 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyRevisionEntity.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/MyRevisionEntity.java @@ -2,12 +2,12 @@ import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.RevisionNumber; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigActiveFalseAndAuditedEntityTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigActiveFalseAndAuditedEntityTest.java index aa43bd037f1af..98e33f6c8214a 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigActiveFalseAndAuditedEntityTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigActiveFalseAndAuditedEntityTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.inject.Inject; -import javax.persistence.metamodel.Bindable; +import jakarta.inject.Inject; +import jakarta.persistence.metamodel.Bindable; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndActiveTrueTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndActiveTrueTest.java index 79d05890ed219..015ce40820608 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndActiveTrueTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndActiveTrueTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.inject.Inject; -import javax.persistence.metamodel.Bindable; +import jakarta.inject.Inject; +import jakarta.persistence.metamodel.Bindable; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndAuditedEntityTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndAuditedEntityTest.java index d6635ea0feb28..a08002b25b19d 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndAuditedEntityTest.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/ConfigEnabledFalseAndAuditedEntityTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.inject.Inject; -import javax.persistence.metamodel.Bindable; +import jakarta.inject.Inject; +import jakarta.persistence.metamodel.Bindable; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAllowIdentifierReuseResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAllowIdentifierReuseResource.java index bc850778d8273..ec292e5af92e1 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAllowIdentifierReuseResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAllowIdentifierReuseResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAuditStrategyResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAuditStrategyResource.java index 935802a49729c..4e306b7d3cc70 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAuditStrategyResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestAuditStrategyResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.strategy.ValidityAuditStrategy; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDefaultSchemaCatalogResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDefaultSchemaCatalogResource.java index 3e286acf0a56b..3561af8b27764 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDefaultSchemaCatalogResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDefaultSchemaCatalogResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDoNotAuditOptimisticLockingFieldResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDoNotAuditOptimisticLockingFieldResource.java index b8d093933a355..160b2a505cf93 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDoNotAuditOptimisticLockingFieldResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestDoNotAuditOptimisticLockingFieldResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hibernate.persister.entity.EntityPersister; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestEmbeddableSetOrdinalFieldNameResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestEmbeddableSetOrdinalFieldNameResource.java index c65d08b75d34f..2eea17a75e150 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestEmbeddableSetOrdinalFieldNameResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestEmbeddableSetOrdinalFieldNameResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedColumnNamingStrategyResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedColumnNamingStrategyResource.java index b37e14c066334..1b11d33a2b452 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedColumnNamingStrategyResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedColumnNamingStrategyResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hibernate.envers.boot.internal.ImprovedModifiedColumnNamingStrategy; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedFlagsResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedFlagsResource.java index 004e53d738027..afcd5f6955064 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedFlagsResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestModifiedFlagsResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestOriginalIdPropNameResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestOriginalIdPropNameResource.java index 657e12e0f51e6..68aa00d195ebb 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestOriginalIdPropNameResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestOriginalIdPropNameResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hibernate.persister.entity.EntityPersister; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionListenerResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionListenerResource.java index fb247da185b4f..8c5ec1c1a570d 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionListenerResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionListenerResource.java @@ -3,9 +3,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionOnCollectionChangeResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionOnCollectionChangeResource.java index 98e82b1e839c4..9406e1dbba828 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionOnCollectionChangeResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestRevisionOnCollectionChangeResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestTrackEntitiesChangedInRevisionResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestTrackEntitiesChangedInRevisionResource.java index 0ef6cb7b74c47..6a26e6abeff4c 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestTrackEntitiesChangedInRevisionResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestTrackEntitiesChangedInRevisionResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestUseRevisionEntityWithNativeIdResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestUseRevisionEntityWithNativeIdResource.java index 1e2bfc68bdd9c..2330d358cfb87 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestUseRevisionEntityWithNativeIdResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestUseRevisionEntityWithNativeIdResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestValidityStrategyFieldNameOverridesResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestValidityStrategyFieldNameOverridesResource.java index d2ff2f748894f..c6149be97b802 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestValidityStrategyFieldNameOverridesResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/config/EnversTestValidityStrategyFieldNameOverridesResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.envers.config; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.envers.AbstractEnversResource; diff --git a/extensions/hibernate-envers/runtime/pom.xml b/extensions/hibernate-envers/runtime/pom.xml index b22c2b29f4177..629766711b228 100644 --- a/extensions/hibernate-envers/runtime/pom.xml +++ b/extensions/hibernate-envers/runtime/pom.xml @@ -17,7 +17,7 @@ org.hibernate - hibernate-envers + hibernate-envers-jakarta diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java index effe1a6823ba6..c48d6bba53428 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ClassNames.java @@ -24,24 +24,24 @@ private static DotName createConstant(String fqcn) { "io.quarkus.hibernate.orm.runtime.tenant.TenantConnectionResolver"); public static final DotName TENANT_RESOLVER = createConstant("io.quarkus.hibernate.orm.runtime.tenant.TenantResolver"); - public static final DotName STATIC_METAMODEL = createConstant("javax.persistence.metamodel.StaticMetamodel"); + public static final DotName STATIC_METAMODEL = createConstant("jakarta.persistence.metamodel.StaticMetamodel"); public static final DotName QUARKUS_PERSISTENCE_UNIT = createConstant("io.quarkus.hibernate.orm.PersistenceUnit"); public static final DotName QUARKUS_PERSISTENCE_UNIT_REPEATABLE_CONTAINER = createConstant( "io.quarkus.hibernate.orm.PersistenceUnit$List"); - public static final DotName JPA_PERSISTENCE_UNIT = createConstant("javax.persistence.PersistenceUnit"); - public static final DotName JPA_PERSISTENCE_CONTEXT = createConstant("javax.persistence.PersistenceContext"); + public static final DotName JPA_PERSISTENCE_UNIT = createConstant("jakarta.persistence.PersistenceUnit"); + public static final DotName JPA_PERSISTENCE_CONTEXT = createConstant("jakarta.persistence.PersistenceContext"); public static final DotName PERSISTENCE_UNIT_EXTENSION = createConstant( "io.quarkus.hibernate.orm.PersistenceUnitExtension"); public static final DotName PERSISTENCE_UNIT_EXTENSION_REPEATABLE_CONTAINER = createConstant( "io.quarkus.hibernate.orm.PersistenceUnitExtension$List"); - public static final DotName JPA_ENTITY = createConstant("javax.persistence.Entity"); - public static final DotName MAPPED_SUPERCLASS = createConstant("javax.persistence.MappedSuperclass"); - public static final DotName EMBEDDABLE = createConstant("javax.persistence.Embeddable"); - public static final DotName CONVERTER = createConstant("javax.persistence.Converter"); - public static final DotName EMBEDDED = createConstant("javax.persistence.Embedded"); - public static final DotName ELEMENT_COLLECTION = createConstant("javax.persistence.ElementCollection"); + public static final DotName JPA_ENTITY = createConstant("jakarta.persistence.Entity"); + public static final DotName MAPPED_SUPERCLASS = createConstant("jakarta.persistence.MappedSuperclass"); + public static final DotName EMBEDDABLE = createConstant("jakarta.persistence.Embeddable"); + public static final DotName CONVERTER = createConstant("jakarta.persistence.Converter"); + public static final DotName EMBEDDED = createConstant("jakarta.persistence.Embedded"); + public static final DotName ELEMENT_COLLECTION = createConstant("jakarta.persistence.ElementCollection"); public static final DotName PROXY = createConstant("org.hibernate.annotations.Proxy"); public static final DotName HIBERNATE_PROXY = createConstant("org.hibernate.proxy.HibernateProxy"); public static final DotName TYPE = createConstant("org.hibernate.annotations.Type"); @@ -49,9 +49,9 @@ private static DotName createConstant(String fqcn) { public static final DotName TYPE_DEFINITIONS = createConstant("org.hibernate.annotations.TypeDefs"); public static final DotName INJECT_SERVICE = createConstant("org.hibernate.service.spi.InjectService"); - public static final DotName ENTITY_MANAGER_FACTORY = createConstant("javax.persistence.EntityManagerFactory"); + public static final DotName ENTITY_MANAGER_FACTORY = createConstant("jakarta.persistence.EntityManagerFactory"); public static final DotName SESSION_FACTORY = createConstant("org.hibernate.SessionFactory"); - public static final DotName ENTITY_MANAGER = createConstant("javax.persistence.EntityManager"); + public static final DotName ENTITY_MANAGER = createConstant("jakarta.persistence.EntityManager"); public static final DotName SESSION = createConstant("org.hibernate.Session"); public static final DotName INTERCEPTOR = createConstant("org.hibernate.Interceptor"); diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java index 740051d409ef8..bc4c30f2646d8 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java @@ -28,97 +28,97 @@ private HibernateOrmAnnotations() { DotName.createSimple("org.hibernate.annotations.TypeDefs")); public static final List JPA_MAPPING_ANNOTATIONS = List.of( - DotName.createSimple("javax.persistence.Access"), - DotName.createSimple("javax.persistence.AssociationOverride"), - DotName.createSimple("javax.persistence.AssociationOverrides"), - DotName.createSimple("javax.persistence.AttributeOverride"), - DotName.createSimple("javax.persistence.AttributeOverrides"), - DotName.createSimple("javax.persistence.Basic"), - DotName.createSimple("javax.persistence.Cacheable"), - DotName.createSimple("javax.persistence.CollectionTable"), - DotName.createSimple("javax.persistence.Column"), - DotName.createSimple("javax.persistence.ColumnResult"), - DotName.createSimple("javax.persistence.ConstructorResult"), - DotName.createSimple("javax.persistence.Convert"), - DotName.createSimple("javax.persistence.Converter"), - DotName.createSimple("javax.persistence.Converts"), - DotName.createSimple("javax.persistence.DiscriminatorColumn"), - DotName.createSimple("javax.persistence.DiscriminatorValue"), - DotName.createSimple("javax.persistence.ElementCollection"), - DotName.createSimple("javax.persistence.Embeddable"), - DotName.createSimple("javax.persistence.Embedded"), - DotName.createSimple("javax.persistence.EmbeddedId"), - DotName.createSimple("javax.persistence.Entity"), - DotName.createSimple("javax.persistence.EntityListeners"), - DotName.createSimple("javax.persistence.EntityResult"), - DotName.createSimple("javax.persistence.Enumerated"), - DotName.createSimple("javax.persistence.ExcludeDefaultListeners"), - DotName.createSimple("javax.persistence.ExcludeSuperclassListeners"), - DotName.createSimple("javax.persistence.FieldResult"), - DotName.createSimple("javax.persistence.ForeignKey"), - DotName.createSimple("javax.persistence.GeneratedValue"), - DotName.createSimple("javax.persistence.Id"), - DotName.createSimple("javax.persistence.IdClass"), - DotName.createSimple("javax.persistence.Index"), - DotName.createSimple("javax.persistence.Inheritance"), - DotName.createSimple("javax.persistence.JoinColumn"), - DotName.createSimple("javax.persistence.JoinColumns"), - DotName.createSimple("javax.persistence.JoinTable"), - DotName.createSimple("javax.persistence.Lob"), - DotName.createSimple("javax.persistence.ManyToMany"), - DotName.createSimple("javax.persistence.ManyToOne"), - DotName.createSimple("javax.persistence.MapKey"), - DotName.createSimple("javax.persistence.MapKeyClass"), - DotName.createSimple("javax.persistence.MapKeyColumn"), - DotName.createSimple("javax.persistence.MapKeyEnumerated"), - DotName.createSimple("javax.persistence.MapKeyJoinColumn"), - DotName.createSimple("javax.persistence.MapKeyJoinColumns"), - DotName.createSimple("javax.persistence.MapKeyTemporal"), - DotName.createSimple("javax.persistence.MappedSuperclass"), - DotName.createSimple("javax.persistence.MapsId"), - DotName.createSimple("javax.persistence.NamedAttributeNode"), - DotName.createSimple("javax.persistence.NamedEntityGraph"), - DotName.createSimple("javax.persistence.NamedEntityGraphs"), - DotName.createSimple("javax.persistence.NamedNativeQueries"), - DotName.createSimple("javax.persistence.NamedNativeQuery"), - DotName.createSimple("javax.persistence.NamedQueries"), - DotName.createSimple("javax.persistence.NamedQuery"), - DotName.createSimple("javax.persistence.NamedStoredProcedureQueries"), - DotName.createSimple("javax.persistence.NamedStoredProcedureQuery"), - DotName.createSimple("javax.persistence.NamedSubgraph"), - DotName.createSimple("javax.persistence.OneToMany"), - DotName.createSimple("javax.persistence.OneToOne"), - DotName.createSimple("javax.persistence.OrderBy"), - DotName.createSimple("javax.persistence.OrderColumn"), - DotName.createSimple("javax.persistence.PersistenceContext"), - DotName.createSimple("javax.persistence.PersistenceContexts"), - DotName.createSimple("javax.persistence.PersistenceProperty"), - DotName.createSimple("javax.persistence.PersistenceUnit"), - DotName.createSimple("javax.persistence.PersistenceUnits"), - DotName.createSimple("javax.persistence.PostLoad"), - DotName.createSimple("javax.persistence.PostPersist"), - DotName.createSimple("javax.persistence.PostRemove"), - DotName.createSimple("javax.persistence.PostUpdate"), - DotName.createSimple("javax.persistence.PrePersist"), - DotName.createSimple("javax.persistence.PreRemove"), - DotName.createSimple("javax.persistence.PreUpdate"), - DotName.createSimple("javax.persistence.PrimaryKeyJoinColumn"), - DotName.createSimple("javax.persistence.PrimaryKeyJoinColumns"), - DotName.createSimple("javax.persistence.QueryHint"), - DotName.createSimple("javax.persistence.SecondaryTable"), - DotName.createSimple("javax.persistence.SecondaryTables"), - DotName.createSimple("javax.persistence.SequenceGenerator"), - DotName.createSimple("javax.persistence.SequenceGenerators"), - DotName.createSimple("javax.persistence.SqlResultSetMapping"), - DotName.createSimple("javax.persistence.SqlResultSetMappings"), - DotName.createSimple("javax.persistence.StoredProcedureParameter"), - DotName.createSimple("javax.persistence.Table"), - DotName.createSimple("javax.persistence.TableGenerator"), - DotName.createSimple("javax.persistence.TableGenerators"), - DotName.createSimple("javax.persistence.Temporal"), - DotName.createSimple("javax.persistence.Transient"), - DotName.createSimple("javax.persistence.UniqueConstraint"), - DotName.createSimple("javax.persistence.Version")); + DotName.createSimple("jakarta.persistence.Access"), + DotName.createSimple("jakarta.persistence.AssociationOverride"), + DotName.createSimple("jakarta.persistence.AssociationOverrides"), + DotName.createSimple("jakarta.persistence.AttributeOverride"), + DotName.createSimple("jakarta.persistence.AttributeOverrides"), + DotName.createSimple("jakarta.persistence.Basic"), + DotName.createSimple("jakarta.persistence.Cacheable"), + DotName.createSimple("jakarta.persistence.CollectionTable"), + DotName.createSimple("jakarta.persistence.Column"), + DotName.createSimple("jakarta.persistence.ColumnResult"), + DotName.createSimple("jakarta.persistence.ConstructorResult"), + DotName.createSimple("jakarta.persistence.Convert"), + DotName.createSimple("jakarta.persistence.Converter"), + DotName.createSimple("jakarta.persistence.Converts"), + DotName.createSimple("jakarta.persistence.DiscriminatorColumn"), + DotName.createSimple("jakarta.persistence.DiscriminatorValue"), + DotName.createSimple("jakarta.persistence.ElementCollection"), + DotName.createSimple("jakarta.persistence.Embeddable"), + DotName.createSimple("jakarta.persistence.Embedded"), + DotName.createSimple("jakarta.persistence.EmbeddedId"), + DotName.createSimple("jakarta.persistence.Entity"), + DotName.createSimple("jakarta.persistence.EntityListeners"), + DotName.createSimple("jakarta.persistence.EntityResult"), + DotName.createSimple("jakarta.persistence.Enumerated"), + DotName.createSimple("jakarta.persistence.ExcludeDefaultListeners"), + DotName.createSimple("jakarta.persistence.ExcludeSuperclassListeners"), + DotName.createSimple("jakarta.persistence.FieldResult"), + DotName.createSimple("jakarta.persistence.ForeignKey"), + DotName.createSimple("jakarta.persistence.GeneratedValue"), + DotName.createSimple("jakarta.persistence.Id"), + DotName.createSimple("jakarta.persistence.IdClass"), + DotName.createSimple("jakarta.persistence.Index"), + DotName.createSimple("jakarta.persistence.Inheritance"), + DotName.createSimple("jakarta.persistence.JoinColumn"), + DotName.createSimple("jakarta.persistence.JoinColumns"), + DotName.createSimple("jakarta.persistence.JoinTable"), + DotName.createSimple("jakarta.persistence.Lob"), + DotName.createSimple("jakarta.persistence.ManyToMany"), + DotName.createSimple("jakarta.persistence.ManyToOne"), + DotName.createSimple("jakarta.persistence.MapKey"), + DotName.createSimple("jakarta.persistence.MapKeyClass"), + DotName.createSimple("jakarta.persistence.MapKeyColumn"), + DotName.createSimple("jakarta.persistence.MapKeyEnumerated"), + DotName.createSimple("jakarta.persistence.MapKeyJoinColumn"), + DotName.createSimple("jakarta.persistence.MapKeyJoinColumns"), + DotName.createSimple("jakarta.persistence.MapKeyTemporal"), + DotName.createSimple("jakarta.persistence.MappedSuperclass"), + DotName.createSimple("jakarta.persistence.MapsId"), + DotName.createSimple("jakarta.persistence.NamedAttributeNode"), + DotName.createSimple("jakarta.persistence.NamedEntityGraph"), + DotName.createSimple("jakarta.persistence.NamedEntityGraphs"), + DotName.createSimple("jakarta.persistence.NamedNativeQueries"), + DotName.createSimple("jakarta.persistence.NamedNativeQuery"), + DotName.createSimple("jakarta.persistence.NamedQueries"), + DotName.createSimple("jakarta.persistence.NamedQuery"), + DotName.createSimple("jakarta.persistence.NamedStoredProcedureQueries"), + DotName.createSimple("jakarta.persistence.NamedStoredProcedureQuery"), + DotName.createSimple("jakarta.persistence.NamedSubgraph"), + DotName.createSimple("jakarta.persistence.OneToMany"), + DotName.createSimple("jakarta.persistence.OneToOne"), + DotName.createSimple("jakarta.persistence.OrderBy"), + DotName.createSimple("jakarta.persistence.OrderColumn"), + DotName.createSimple("jakarta.persistence.PersistenceContext"), + DotName.createSimple("jakarta.persistence.PersistenceContexts"), + DotName.createSimple("jakarta.persistence.PersistenceProperty"), + DotName.createSimple("jakarta.persistence.PersistenceUnit"), + DotName.createSimple("jakarta.persistence.PersistenceUnits"), + DotName.createSimple("jakarta.persistence.PostLoad"), + DotName.createSimple("jakarta.persistence.PostPersist"), + DotName.createSimple("jakarta.persistence.PostRemove"), + DotName.createSimple("jakarta.persistence.PostUpdate"), + DotName.createSimple("jakarta.persistence.PrePersist"), + DotName.createSimple("jakarta.persistence.PreRemove"), + DotName.createSimple("jakarta.persistence.PreUpdate"), + DotName.createSimple("jakarta.persistence.PrimaryKeyJoinColumn"), + DotName.createSimple("jakarta.persistence.PrimaryKeyJoinColumns"), + DotName.createSimple("jakarta.persistence.QueryHint"), + DotName.createSimple("jakarta.persistence.SecondaryTable"), + DotName.createSimple("jakarta.persistence.SecondaryTables"), + DotName.createSimple("jakarta.persistence.SequenceGenerator"), + DotName.createSimple("jakarta.persistence.SequenceGenerators"), + DotName.createSimple("jakarta.persistence.SqlResultSetMapping"), + DotName.createSimple("jakarta.persistence.SqlResultSetMappings"), + DotName.createSimple("jakarta.persistence.StoredProcedureParameter"), + DotName.createSimple("jakarta.persistence.Table"), + DotName.createSimple("jakarta.persistence.TableGenerator"), + DotName.createSimple("jakarta.persistence.TableGenerators"), + DotName.createSimple("jakarta.persistence.Temporal"), + DotName.createSimple("jakarta.persistence.Transient"), + DotName.createSimple("jakarta.persistence.UniqueConstraint"), + DotName.createSimple("jakarta.persistence.Version")); public static final List HIBERNATE_MAPPING_ANNOTATIONS = List.of( DotName.createSimple("org.hibernate.annotations.AccessType"), @@ -221,12 +221,12 @@ private HibernateOrmAnnotations() { DotName.createSimple("org.hibernate.engine.jdbc.cursor.internal.StandardRefCursorSupport")); public static final List JPA_LISTENER_ANNOTATIONS = List.of( - DotName.createSimple("javax.persistence.PostLoad"), - DotName.createSimple("javax.persistence.PostPersist"), - DotName.createSimple("javax.persistence.PostRemove"), - DotName.createSimple("javax.persistence.PostUpdate"), - DotName.createSimple("javax.persistence.PrePersist"), - DotName.createSimple("javax.persistence.PreRemove"), - DotName.createSimple("javax.persistence.PreUpdate")); + DotName.createSimple("jakarta.persistence.PostLoad"), + DotName.createSimple("jakarta.persistence.PostPersist"), + DotName.createSimple("jakarta.persistence.PostRemove"), + DotName.createSimple("jakarta.persistence.PostUpdate"), + DotName.createSimple("jakarta.persistence.PrePersist"), + DotName.createSimple("jakarta.persistence.PreRemove"), + DotName.createSimple("jakarta.persistence.PreUpdate")); } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java index 38bcc201eed4d..11ba38dedd6a8 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java @@ -7,8 +7,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java index cd98bf5ae3d65..d788b78380818 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java @@ -32,16 +32,17 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.persistence.AttributeConverter; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; -import javax.transaction.TransactionManager; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; +import jakarta.transaction.TransactionManager; +import jakarta.xml.bind.JAXBElement; + import org.hibernate.boot.archive.scan.spi.ClassDescriptor; import org.hibernate.boot.archive.scan.spi.PackageDescriptor; import org.hibernate.cfg.AvailableSettings; diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java index 8890c080ee02a..1d48665ff8724 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java @@ -494,7 +494,7 @@ private static boolean isIgnored(DotName classDotName) { String className = classDotName.toString(); if (className.startsWith("java.util.") || className.startsWith("java.lang.") || className.startsWith("org.hibernate.engine.spi.") - || className.startsWith("javax.persistence.") + || className.startsWith("jakarta.persistence.") || className.startsWith("jakarta.persistence.")) { return true; } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelBuildItem.java index dd614b1c7347c..00eed878c7aeb 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelBuildItem.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelBuildItem.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.TreeSet; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.jboss.jandex.DotName; diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/QuarkusPersistenceXmlParser.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/QuarkusPersistenceXmlParser.java index 06189f0913bfa..1293b51191a19 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/QuarkusPersistenceXmlParser.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/QuarkusPersistenceXmlParser.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.hibernate.jpa.boot.internal.PersistenceXmlParser; diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ResteasyReactiveServerIntegrationProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ResteasyReactiveServerIntegrationProcessor.java index 3c1800fd2969f..f015b4037083a 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ResteasyReactiveServerIntegrationProcessor.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ResteasyReactiveServerIntegrationProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.deployment; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.BuildSteps; diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java index 96e8de319f2d3..b7a700e2802ff 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.deployment.test; -import javax.enterprise.inject.spi.CDI; -import javax.persistence.EntityManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.persistence.EntityManager; import io.quarkus.narayana.jta.runtime.test.TestTransactionCallback; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java index 51895d50c14e3..5a0609ecdd0ec 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java index 6d27add51d26b..d9e356bc3edc9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Hibernate; import org.jboss.jandex.AnnotationInstance; @@ -51,7 +51,7 @@ public static void index() throws IOException { @Test public void testNoMissingJpaAnnotation() { Set jpaMappingAnnotations = findRuntimeAnnotations(jpaIndex); - jpaMappingAnnotations.removeIf(name -> name.toString().startsWith("javax.persistence.metamodel.")); + jpaMappingAnnotations.removeIf(name -> name.toString().startsWith("jakarta.persistence.metamodel.")); assertThat(HibernateOrmAnnotations.JPA_MAPPING_ANNOTATIONS) .containsExactlyInAnyOrderElementsOf(jpaMappingAnnotations); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java index 16a072e787fbc..22125085774ad 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.hibernate.Session; import org.hibernate.cache.spi.CacheImplementor; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java index 78bcacddd6b2a..4c7ecd850e049 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntity.java index 69a3dfb0d6c4d..82522bff4b6aa 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntity.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.orm; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; @Entity public class MyEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntityTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntityTestResource.java index a2827a372d727..32a9e7347c80b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntityTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/MyEntityTestResource.java @@ -1,13 +1,13 @@ package io.quarkus.hibernate.orm; -import javax.inject.Inject; -import javax.persistence.EntityManager; -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.MediaType; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +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.MediaType; @Path("/my-entity") public class MyEntityTestResource { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java index 27bbb9c23b507..a3c88f33abf83 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoTransactionTest.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TransactionRequiredException; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TransactionRequiredException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntity.java index 777ff0d0d081d..aa3644e2e903a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntity.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.orm; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; @Entity public class OtherEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntityTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntityTestResource.java index 43213338a1b61..5241ded42fa87 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntityTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/OtherEntityTestResource.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.orm; -import javax.inject.Inject; -import javax.persistence.EntityManager; -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.persistence.EntityManager; +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("/other-entity") public class OtherEntityTestResource { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SchemaUtil.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SchemaUtil.java index 786743640dfbe..9ddd7e2d461d0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SchemaUtil.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SchemaUtil.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.AbstractEntityPersister; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SmokeTestUtils.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SmokeTestUtils.java index fbaa9784096f8..b720b3f156795 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SmokeTestUtils.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/SmokeTestUtils.java @@ -5,7 +5,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Very simple reusable tests that simply check that persistence doesn't seem to explode. diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/TransactionTestUtils.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/TransactionTestUtils.java index 7f57554a2dbfc..9b8cebb443659 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/TransactionTestUtils.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/TransactionTestUtils.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; public class TransactionTestUtils { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java index 1f32c84dd1535..b8b01f621c584 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/GetterAccessAssociationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/GetterAccessAssociationsTest.java index b11e678d654c0..76a91e1f4d8f9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/GetterAccessAssociationsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/GetterAccessAssociationsTest.java @@ -7,23 +7,23 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.hibernate.Hibernate; import org.hibernate.LazyInitializationException; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessAssociationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessAssociationsTest.java index eb33fe93856b5..8f878ae8aeafe 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessAssociationsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessAssociationsTest.java @@ -5,23 +5,23 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.hibernate.Hibernate; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFieldTypesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFieldTypesTest.java index 657bcbefb5a04..e654142647fbb 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFieldTypesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFieldTypesTest.java @@ -4,17 +4,17 @@ import java.time.LocalDate; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.hibernate.Hibernate; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFinalFieldTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFinalFieldTest.java index 14b8157df5b00..c0c317ac5212d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFinalFieldTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessFinalFieldTest.java @@ -12,15 +12,15 @@ import java.util.Objects; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.transaction.UserTransaction; import org.hibernate.annotations.Immutable; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessInheritanceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessInheritanceTest.java index 21eca3aedf230..1fff2080e1951 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessInheritanceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldAccessInheritanceTest.java @@ -2,18 +2,18 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.hibernate.Hibernate; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldWithProxyAndLazyLoadingAndInheritanceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldWithProxyAndLazyLoadingAndInheritanceTest.java index 09ce9e5542bc9..0d54300f1837c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldWithProxyAndLazyLoadingAndInheritanceTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/applicationfieldaccess/PublicFieldWithProxyAndLazyLoadingAndInheritanceTest.java @@ -9,15 +9,15 @@ import static io.quarkus.hibernate.orm.TransactionTestUtils.inTransaction; import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.transaction.UserTransaction; import org.hibernate.Hibernate; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java index f42f99c5d75dc..aeae08943f7e8 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/attributeconverter/AttributeConverterAutoApplyTest.java @@ -2,15 +2,15 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.AttributeConverter; -import javax.persistence.Basic; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Basic; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.UserTransaction; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java index cb27c4980500e..46a7ddd81982a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/BatchFetchSizeTest.java @@ -4,8 +4,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; import org.hibernate.Hibernate; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/MainEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/MainEntity.java index 24991eb440382..1c27b81aaabe1 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/MainEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/MainEntity.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class MainEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/OtherEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/OtherEntity.java index c949597ca2d88..021ebffbfe51f 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/OtherEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/batch/OtherEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.batch; -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 public class OtherEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigActiveFalseAndEntityTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigActiveFalseAndEntityTest.java index adba4fcda687f..3c36eac99a6eb 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigActiveFalseAndEntityTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigActiveFalseAndEntityTest.java @@ -3,9 +3,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigEnabledFalseAndEntityTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigEnabledFalseAndEntityTest.java index f4ca7a7979d2a..89a28b9e244c4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigEnabledFalseAndEntityTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/ConfigEnabledFalseAndEntityTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java index f0bd91cbfcdd4..64bea93d727ba 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.config; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java index 448718117c48d..f717f7a5fc5b3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.config.namedpu; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/unsupportedproperties/UnsupportedPropertiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/unsupportedproperties/UnsupportedPropertiesTest.java index 7645a5ccc8e26..60f3f592e96f7 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/unsupportedproperties/UnsupportedPropertiesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/unsupportedproperties/UnsupportedPropertiesTest.java @@ -9,15 +9,15 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.inject.Inject; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.BaseSessionEventListener; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsoleInfoSupplierTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsoleInfoSupplierTestResource.java index ee7d67d45428a..cb49eafd682bd 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsoleInfoSupplierTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/DevConsoleInfoSupplierTestResource.java @@ -4,10 +4,10 @@ import java.util.Collection; -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.hibernate.orm.runtime.PersistenceUnitUtil; import io.quarkus.hibernate.orm.runtime.devconsole.HibernateOrmDevConsoleInfoSupplier; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithFailingDDLGeneration.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithFailingDDLGeneration.java index f698f9d7eff99..aaaa30ecec2de 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithFailingDDLGeneration.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithFailingDDLGeneration.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.devconsole; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithSuccessfulDDLGeneration.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithSuccessfulDDLGeneration.java index fed6cdfe1f56f..2fdb5533fb640 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithSuccessfulDDLGeneration.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/devconsole/MyEntityWithSuccessfulDDLGeneration.java @@ -1,13 +1,13 @@ package io.quarkus.hibernate.orm.devconsole; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.Table; @Entity(name = MyEntityWithSuccessfulDDLGeneration.NAME) @Table(name = MyEntityWithSuccessfulDDLGeneration.TABLE_NAME) diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/Address.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/Address.java index d378a84c78179..2fda35a337a41 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/Address.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/Address.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.enhancer; -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 public class Address { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java index 13a2287eec7c6..cb75eb3788fa6 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerFinalFieldTest.java @@ -12,15 +12,15 @@ import java.util.Objects; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.transaction.UserTransaction; import org.hibernate.annotations.Immutable; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java index 0171ef5763be2..1576205438b92 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueTest.java @@ -4,9 +4,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java index 01d6cef662322..7de645adc39d3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithMultiplePUsTest.java @@ -4,9 +4,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java index a125dc4f807cb..6aeb5fb72ecf3 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedDefaultValueWithPersistenceXmlTest.java @@ -5,9 +5,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java index c23694cf8b683..9e020a7520bfa 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedFalseValueWithPersistenceXmlTest.java @@ -5,9 +5,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java index 326562e12bf75..1322a6297276f 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueTest.java @@ -4,9 +4,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java index 73564b1cf1d77..291b825926a5f 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithMultiplePUsTest.java @@ -4,9 +4,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java index 150f6759a64a3..474b28bf83fbd 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ignore_explicit_for_joined/IgnoreExplicitForJoinedTrueValueWithPersistenceXmlTest.java @@ -5,9 +5,9 @@ import java.util.Map; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java index 3acbf402aed18..d114c555a330d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/ApplicationScopedInterceptorTest.java @@ -7,12 +7,12 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.UserTransaction; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.UserTransaction; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java index c6b7a42a656d4..3824f3b3eb5bd 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/DependentInterceptorTest.java @@ -7,13 +7,13 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.UserTransaction; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java index 029d581d7f12d..8878a756c2cb1 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/interceptor/TransactionScopedInterceptorTest.java @@ -8,13 +8,13 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.TransactionScoped; -import javax.transaction.UserTransaction; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.TransactionScoped; +import jakarta.transaction.UserTransaction; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; @@ -95,7 +95,7 @@ public void testManualSessionNoTransaction() { manualSession.find(MyEntity.class, 0); } }) - .isInstanceOf(javax.enterprise.context.ContextNotActiveException.class); + .isInstanceOf(jakarta.enterprise.context.ContextNotActiveException.class); assertThat(TransactionScopedInterceptor.instances).isEmpty(); assertThat(TransactionScopedInterceptor.loadedIds).isEmpty(); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/jdbc/ApplicationScopedStatementInspectorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/jdbc/ApplicationScopedStatementInspectorTest.java index 81881654bc0db..9b17029e1da03 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/jdbc/ApplicationScopedStatementInspectorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/jdbc/ApplicationScopedStatementInspectorTest.java @@ -5,12 +5,12 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.transaction.UserTransaction; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.transaction.UserTransaction; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/AbstractLazyBasicTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/AbstractLazyBasicTest.java index d19a4dd62178a..0efe1e06bdc0d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/AbstractLazyBasicTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/AbstractLazyBasicTest.java @@ -2,9 +2,9 @@ import static io.quarkus.hibernate.orm.TransactionTestUtils.inTransaction; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicDefaultGroupTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicDefaultGroupTest.java index 9de6fb25239b1..0fbd07d71bfe4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicDefaultGroupTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicDefaultGroupTest.java @@ -2,13 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicMultiNonDefaultGroupTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicMultiNonDefaultGroupTest.java index b55f00ab4e8f1..c3709a6af399b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicMultiNonDefaultGroupTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicMultiNonDefaultGroupTest.java @@ -2,13 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicNonDefaultGroupTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicNonDefaultGroupTest.java index 066369407e320..0d8182b019e92 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicNonDefaultGroupTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/lazyloading/LazyBasicNonDefaultGroupTest.java @@ -2,13 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.Hibernate; import org.hibernate.annotations.LazyGroup; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersDefaultValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersDefaultValueTest.java index f11a12284f522..fe59e01f3b1b0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersDefaultValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersDefaultValueTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersTrueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersTrueTest.java index e7110907de6af..da43073745a23 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersTrueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogBindParametersTrueTest.java @@ -4,9 +4,9 @@ import java.util.logging.Formatter; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlDefaultValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlDefaultValueTest.java index 134a7824191ee..9426791910586 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlDefaultValueTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlDefaultValueTest.java @@ -4,8 +4,8 @@ import java.util.Map; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlFalseTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlFalseTest.java index 12eee82daca9a..0725a4bab39e7 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlFalseTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/log/LogSqlFormatSqlFalseTest.java @@ -4,8 +4,8 @@ import java.util.Map; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.hibernate.cfg.AvailableSettings; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java index 322c8a2f397c9..5ea3b81d9a495 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MetadataBuilderContributorTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MyEntity.java index f359e6333e1e0..edcbc3bde6f91 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MyEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/metadatabuildercontributor/MyEntity.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.metadatabuildercontributor; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java index e54a57bd14ca8..3866961095489 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java @@ -4,12 +4,12 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TransactionRequiredException; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TransactionRequiredException; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java index 298c8cbcb3cb5..e4b616c6452f0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java @@ -4,11 +4,11 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.TransactionRequiredException; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.TransactionRequiredException; +import jakarta.transaction.Transactional; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java index c54039c29950c..33b996a9a0281 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits; -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; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java index 3ea762b478a4e..d5f73061f69ad 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInterceptorTest.java @@ -7,8 +7,8 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java index b60cc19306e3c..01640faa96d20 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java @@ -3,9 +3,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java index 559c3afaea2b0..de7eb15cbae28 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java @@ -3,9 +3,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java index 9f6bb37c5e904..1296ef7636856 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java index 3d6a2f7d73ed1..250e298c1c04c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits; -import javax.inject.Inject; -import javax.persistence.EntityManager; -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.persistence.EntityManager; +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.hibernate.orm.multiplepersistenceunits.model.annotation.shared.SharedEntity; @@ -29,4 +29,4 @@ public String getName(@PathParam("id") long id) { return NO_ENTITY_MESSAGE; } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java index 1f23dad8c30ff..14c8fb08046bc 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java @@ -6,9 +6,9 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java index 0e30523433e30..ddbc030e9bd78 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.inventory; -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 public class Plane { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java index 3d6ce1d1fd7de..a44bf088f606e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.shared; -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 public class SharedEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java index 5071e3a692150..5f00bb3efda64 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "User_") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java index 23bbff849c261..c31218d987542 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user.subpackage; -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 public class OtherUserInSubPackage { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java index 2728a81561194..6ba640a717f90 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.config; -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 public class DefaultEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java index d750e05c35492..2933e7327e54e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory; -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 public class Plane { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java index 97689aadcf801..7af54d28438e4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "User_") diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java index 79aab86e17251..63ff486b993fa 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/ImplicitNamingStrategyTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java index 757e4a47c97c3..5434b8a921a89 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/PhysicalNamingStrategyTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java index 9f83eee305db2..fa9bca678edb7 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.packages; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ChildEntity1 { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java index 665d572744948..2feed342d0f86 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.packages; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ChildEntity2 { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java index b299c86075d08..55f4335c0baa9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java index 747a825970d3a..f58eb8653d7f1 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.packages; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import org.hibernate.annotations.Any; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java index b1916e4be18e8..75a9589301ca9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/persistenceunitextension/InvalidTypeForPersistenceUnitExtensionTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.inject.spi.DeploymentException; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Interceptor; import org.hibernate.boot.model.naming.Identifier; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/Group.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/Group.java index 6cabd8351cf84..ea871f59232ee 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/Group.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/Group.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.quoting_strategies; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Table with reserved name and containing one column with reserved name and column definition. diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/QuotedResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/QuotedResource.java index 35a0be4dc2cfe..ade8e88bc1f8d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/QuotedResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/QuotedResource.java @@ -1,14 +1,14 @@ package io.quarkus.hibernate.orm.quoting_strategies; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +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; /** * Try to fetch entity with reserved name and containing one column with reserved name and column definition. diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java index 2bf67932d09a7..945b845eab2ee 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.singlepersistenceunit; -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 public class DefaultEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java index f032a4230e5d0..5c68407bcfdb8 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java @@ -4,12 +4,12 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TransactionRequiredException; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TransactionRequiredException; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java index e6745a17c01f7..7661cbac0c603 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java @@ -4,11 +4,11 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.persistence.TransactionRequiredException; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.persistence.TransactionRequiredException; +import jakarta.transaction.Transactional; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java index 262c1bd3c32a4..5c68053bc63bb 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java @@ -7,9 +7,9 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java index 8a92fbfafe22e..1e9c30a5a1158 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java @@ -7,9 +7,9 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java index 97b252688ad6c..cdf642ae33c9b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java index 4e2e5904cf0f0..6ae62abf3988c 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; +import jakarta.persistence.PersistenceContext; +import jakarta.transaction.Transactional; import org.hibernate.Session; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java index c507545290f99..dbcd3b4b18757 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.singlepersistenceunit.entityassignment.excludedpackage; -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 public class ExcludedEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java index fc3bb7c5dac20..b1a43fe0de646 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.singlepersistenceunit.entityassignment.packageincludedthroughannotation; -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 public class EntityIncludedThroughPackageAnnotation { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java index 2be579366ee19..0512822fc4e6a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.singlepersistenceunit.entityassignment.packageincludedthroughconfig; -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 public class EntityIncludedThroughPackageConfig { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/DataIdentity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/DataIdentity.java index c23c886b76fea..d5b7d22f639be 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/DataIdentity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/DataIdentity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.specialmappings; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @IdClass(IdVersionPK.class) @@ -28,4 +28,4 @@ public Long getVersion() { public void setVersion(Long version) { this.version = version; } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/IdVersionPK.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/IdVersionPK.java index df4d95c6c839a..6bf8c4fca059d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/IdVersionPK.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/IdVersionPK.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Id; +import jakarta.persistence.Id; public class IdVersionPK implements Serializable { @Id diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/NormalPointEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/NormalPointEntity.java index 803fb7774f029..3891b82fa07a4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/NormalPointEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/NormalPointEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.specialmappings; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class NormalPointEntity extends PointEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/PointEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/PointEntity.java index 52a06a3aac68a..d5fe7df8dbf16 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/PointEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/specialmappings/PointEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.specialmappings; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public abstract class PointEntity extends DataIdentity { @@ -13,4 +13,4 @@ public String getName() { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java index dd4a1347ae167..8c78fddf85721 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/InvalidMultilineSqlLoadScriptTestCase.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.sql_load_script; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java index 2308e1d2072e2..083a2cc9e20f2 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.sql_load_script; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.orm.MyEntity; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java index d90b43798d551..8b415a322f23d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java @@ -13,9 +13,9 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.BaseSessionEventListener; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java index 125737565ac54..c01e81bd7c7d9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java @@ -2,11 +2,11 @@ import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; public class GetTransactionLifecycleTest extends AbstractTransactionLifecycleTest { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java index 09c1209b553cd..1cf334a5a3ffb 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.transaction; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SimpleEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java index c1e1c63b927da..ae5d701d49559 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java @@ -2,10 +2,10 @@ import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; /** * Check transaction lifecycle, including session flushes and the closing of the session. diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java index 0aa6e612f07a1..0192d290c3fb2 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java @@ -2,15 +2,15 @@ import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; /** * Check transaction lifecycle, including session flushes and the closing of the session. diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPATestValidationResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPATestValidationResource.java index d338b8b3df610..5f9c41149a286 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPATestValidationResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPATestValidationResource.java @@ -2,13 +2,13 @@ import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.MyEntity; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationDisabledTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationDisabledTestCase.java index 33759606d7777..767ef0337761a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationDisabledTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationDisabledTestCase.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.is; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlComponentTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlComponentTest.java index 236039dcdb4c9..d9d81ec7f1af6 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlComponentTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlComponentTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlFilterDefTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlFilterDefTest.java index 6c6c75a2841df..14e73e30478f0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlFilterDefTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlFilterDefTest.java @@ -4,8 +4,8 @@ import java.util.Collections; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadTestResource.java index 7886aa6020817..8eb4d11b015de 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlHotReloadTestResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.xml.hbm; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; -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.EntityManagerFactory; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.orm.SchemaUtil; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java index 506ce6f0a26c4..6e827e157e651 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/hbm/HbmXmlQuarkusConfigTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/AnnotatedEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/AnnotatedEntity.java index d0976b2d339a6..2080709e8e761 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/AnnotatedEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/AnnotatedEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.xml.orm; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class AnnotatedEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java index b4a753e39a8e3..ab04ceb1f775e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlAnnotationOverrideTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadTestResource.java index c3f8914c32b7b..ad8dd727cc76b 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadTestResource.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlHotReloadTestResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.xml.orm; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; -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.EntityManagerFactory; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.orm.SchemaUtil; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java index 7dc1d9290c678..147793e902033 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPackageTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java index e4bec7228c7d7..cd239982aa460 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlExplicitFileTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java index f7e6e79e7fff4..529175b58c75a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlImplicitFileTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java index c51a708728b32..4f579272352a0 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlPersistenceXmlNoFileTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java index 24676dd89b24c..92dba67b09a93 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigExplicitFileTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java index 9cca47240bcd3..45bec1ccdfe7a 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigImplicitFileTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java index 2179bd835eaa1..8dd82105a588d 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/orm/OrmXmlQuarkusConfigNoFileTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingApplicationPropertiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingApplicationPropertiesTest.java index 3a78729cbcda7..71d7e2c2d80f5 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingApplicationPropertiesTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingApplicationPropertiesTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingSystemPropertyTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingSystemPropertyTest.java index c227b301ba371..026f2365ef0c9 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingSystemPropertyTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/ExcludePersistenceXmlConfigUsingSystemPropertyTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/MyEntity.java index 2eaf0a1421ba7..14ebc626785b4 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/MyEntity.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/MyEntity.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.xml.persistence; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyEntity { diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java index 5439e4bb98e66..89ec8090d3281 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/xml/persistence/PersistenceXmlTest.java @@ -6,9 +6,9 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Assertions; diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml index acacdcf4e5c77..6606e900865f6 100644 --- a/extensions/hibernate-orm/runtime/pom.xml +++ b/extensions/hibernate-orm/runtime/pom.xml @@ -58,38 +58,16 @@ org.hibernate - hibernate-core + hibernate-core-jakarta - - javax.persistence - javax.persistence-api - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec - - - - - javax.xml.bind - jaxb-api - org.glassfish.jaxb jaxb-runtime - - jakarta.activation jakarta.activation-api - - javax.activation - javax.activation-api - - - io.smallrye jandex @@ -120,8 +98,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api jakarta.persistence @@ -138,7 +116,7 @@ org.hibernate - quarkus-local-cache + quarkus-local-cache-jakarta * diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java index cba9795086f54..1bdfd2f285b77 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java @@ -12,10 +12,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import io.quarkus.hibernate.orm.PersistenceUnit.List; import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnitExtension.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnitExtension.java index 91aec51cc66fd..566455799e962 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnitExtension.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnitExtension.java @@ -11,8 +11,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * CDI qualifier for beans representing an "extension" of a persistence unit, diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java index c26e77171cf2b..bc603cc3c7553 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java @@ -7,12 +7,13 @@ import java.util.Optional; import java.util.Set; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; import javax.sql.DataSource; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; + import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java index 31a74d5dabfad..3eb01167946f9 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.ConfigProvider; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java index c3814eb7d8436..d8fa16c5b0810 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java @@ -10,14 +10,14 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import org.jboss.logging.Logger; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java index 52e1ff92a0e29..21bedfc8ab7c2 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java @@ -12,13 +12,13 @@ private PersistenceProviderSetup() { } public static void registerStaticInitPersistenceProvider() { - javax.persistence.spi.PersistenceProviderResolverHolder + jakarta.persistence.spi.PersistenceProviderResolverHolder .setPersistenceProviderResolver(new StaticInitHibernatePersistenceProviderResolver()); } public static void registerRuntimePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig, Map> integrationRuntimeDescriptors) { - javax.persistence.spi.PersistenceProviderResolverHolder.setPersistenceProviderResolver( + jakarta.persistence.spi.PersistenceProviderResolverHolder.setPersistenceProviderResolver( new SingletonPersistenceProviderResolver( new FastBootHibernatePersistenceProvider(hibernateOrmRuntimeConfig, integrationRuntimeDescriptors))); } diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java index d106f3be75d20..caf85a8de7249 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java @@ -3,7 +3,7 @@ import java.util.Comparator; import java.util.Locale; -import javax.enterprise.inject.Default; +import jakarta.enterprise.inject.Default; import org.jboss.logging.Logger; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java index 7ef88ce9ad1ad..357883ed67fe6 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.runtime; -import javax.persistence.spi.LoadState; +import jakarta.persistence.spi.LoadState; import org.hibernate.jpa.internal.util.PersistenceUtilHelper; -public final class ProviderUtil implements javax.persistence.spi.ProviderUtil { +public final class ProviderUtil implements jakarta.persistence.spi.ProviderUtil { private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache(); @@ -22,4 +22,4 @@ public LoadState isLoadedWithReference(Object proxy, String property) { public LoadState isLoaded(Object o) { return PersistenceUtilHelper.isLoaded(o); } -} \ No newline at end of file +} diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java index 726c8c788830f..2e7ac977e1e4f 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java index 2deb6703713f7..5a88ab472be03 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java @@ -3,8 +3,8 @@ import java.util.Collections; import java.util.List; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; public final class SingletonPersistenceProviderResolver implements PersistenceProviderResolver { diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java index 0a584f45d1f2b..18f90807c24aa 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; /** * During the static init phase, we don't access the PersistenceProviderResolver. diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java index 621a1c15e88f6..22ae50d19590b 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java @@ -3,11 +3,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java index f634a1f889564..a1542a51ff1d9 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java @@ -3,11 +3,12 @@ import java.io.Serializable; import java.security.NoSuchAlgorithmException; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; import javax.sql.DataSource; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; + import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.MultiTenancyStrategy; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java index 84b41b4cbb472..6662a3897919a 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java @@ -28,8 +28,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.boot.CacheRegionDefinition; import org.hibernate.boot.MetadataBuilder; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java index 39b74a279cf92..d8895698bfe27 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RuntimePersistenceUnitDescriptor.java @@ -6,9 +6,9 @@ import java.util.Objects; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/xml/JAXBElementSubstitution.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/xml/JAXBElementSubstitution.java index 358741260311f..6ce6f7ad4e8f9 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/xml/JAXBElementSubstitution.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/xml/JAXBElementSubstitution.java @@ -1,8 +1,9 @@ package io.quarkus.hibernate.orm.runtime.boot.xml; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; +import jakarta.xml.bind.JAXBElement; + import io.quarkus.runtime.ObjectSubstitution; import io.quarkus.runtime.annotations.RecordableConstructor; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java index 7271dba47d473..258569ddcb93b 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java @@ -6,10 +6,10 @@ */ package io.quarkus.hibernate.orm.runtime.cdi; -import javax.annotation.PreDestroy; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.hibernate.resource.beans.container.spi.AbstractCdiBeanContainer; import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java index bcef7173c4010..0a5a419a8ee34 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.orm.runtime.customized; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy; import org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerAccess; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java index 91f8f238f0875..ba3ed149585ef 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java @@ -1,13 +1,13 @@ package io.quarkus.hibernate.orm.runtime.graal; -import javax.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProviderResolver; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind; import com.oracle.svm.core.annotate.TargetClass; -@TargetClass(className = "javax.persistence.spi.PersistenceProviderResolverHolder") +@TargetClass(className = "jakarta.persistence.spi.PersistenceProviderResolverHolder") public final class Substitute_PersistenceProviderResolverHolder { @Alias diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java index 864e12eb37bc7..4bc638be51d37 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java @@ -5,22 +5,22 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.inject.Instance; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.TransactionRequiredException; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.metamodel.Metamodel; -import javax.transaction.Status; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.inject.Instance; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.TransactionRequiredException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.metamodel.Metamodel; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.hibernate.CacheMode; import org.hibernate.Criteria; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java index 22a9a1149b3cd..29b38ebebadbe 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java @@ -5,7 +5,7 @@ import java.util.Locale; import java.util.Optional; -import javax.enterprise.inject.Default; +import jakarta.enterprise.inject.Default; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.jboss.logging.Logger; diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java index 1455be9ea3932..f29c007142fd4 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.SessionScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.SessionScoped; import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java index 9986eec287693..b1336aa1da174 100644 --- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java +++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java @@ -21,8 +21,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.SharedCacheMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/ResteasyReactiveServerIntegrationProcessor.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/ResteasyReactiveServerIntegrationProcessor.java index 18e9233a30be4..8ddc110495d67 100644 --- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/ResteasyReactiveServerIntegrationProcessor.java +++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/ResteasyReactiveServerIntegrationProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.deployment; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.BuildSteps; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java index e9b8e801ed350..4abbf2db1e3df 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/MultiLineImportTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.inject.Inject; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.reactive.mutiny.Mutiny; import org.junit.jupiter.api.Test; @@ -39,8 +39,8 @@ public void integerIdentifierWithStageAPI(UniAsserter asserter) { @Table(name = "hero") public static class Hero { - @javax.persistence.Id - @javax.persistence.GeneratedValue + @jakarta.persistence.Id + @jakarta.persistence.GeneratedValue public java.lang.Long id; @Column(unique = true) diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java index e88ca37be8719..f6767d8194870 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java @@ -2,11 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaUpdateTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaUpdateTest.java index 2037112e49898..2124343f20b0b 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaUpdateTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaUpdateTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.inject.Inject; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.reactive.mutiny.Mutiny; import org.junit.jupiter.api.Test; @@ -43,8 +43,8 @@ public static class Hero { public static final String TABLE = "Hero_for_SchemaUpdateTest"; - @javax.persistence.Id - @javax.persistence.GeneratedValue + @jakarta.persistence.Id + @jakarta.persistence.GeneratedValue public java.lang.Long id; @Column(unique = true) diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaValidateTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaValidateTest.java index 050bab88a818b..7e1a9f83e7b6b 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaValidateTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/SchemaValidateTest.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.reactive; -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.inject.Inject; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.hibernate.reactive.mutiny.Mutiny; import org.hibernate.tool.schema.spi.SchemaManagementException; @@ -47,8 +47,8 @@ public static class Hero { public static final String TABLE = "Hero_for_validation"; - @javax.persistence.Id - @javax.persistence.GeneratedValue + @jakarta.persistence.Id + @jakarta.persistence.GeneratedValue public java.lang.Long id; @Column(unique = true) diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigActiveFalseAndEntityTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigActiveFalseAndEntityTest.java index 443fd3ce1f2c3..9fcf506db5f91 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigActiveFalseAndEntityTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigActiveFalseAndEntityTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigEnabledFalseAndEntityTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigEnabledFalseAndEntityTest.java index 7e037649319d2..6db964a840beb 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigEnabledFalseAndEntityTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/ConfigEnabledFalseAndEntityTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/MyEntity.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/MyEntity.java index e423c9f82a47b..7a959c08dffb7 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/MyEntity.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/MyEntity.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.reactive.config; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyEntity { diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/ContextFruitResource.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/ContextFruitResource.java index b22d7f8309d21..60d4c0ac3945c 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/ContextFruitResource.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/ContextFruitResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.reactive.context; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.hibernate.reactive.mutiny.Mutiny; import org.jboss.resteasy.reactive.RestPath; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/Fruit.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/Fruit.java index 8cd7202aaa9a5..04b97243fec68 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/Fruit.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/context/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.context; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "context_fruits") diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/Fruit.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/Fruit.java index f97af4fa431fa..44ec8f06906d8 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/Fruit.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/Fruit.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.reactive.dev; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/FruitMutinyResource.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/FruitMutinyResource.java index e05664860e2f1..3265081c4040e 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/FruitMutinyResource.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/dev/FruitMutinyResource.java @@ -1,24 +1,24 @@ package io.quarkus.hibernate.reactive.dev; -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.util.List; -import javax.enterprise.context.ApplicationScoped; -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.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.ApplicationScoped; +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.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hibernate.reactive.mutiny.Mutiny; import org.jboss.logging.Logger; @@ -103,7 +103,7 @@ public Uni delete(@RestPath Integer id) { * { * "code": 422, * "error": "Fruit name was not set on request.", - * "exceptionType": "javax.ws.rs.WebApplicationException" + * "exceptionType": "jakarta.ws.rs.WebApplicationException" * } * */ diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java index d5eefc6786237..1cfc3b39edfc6 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java @@ -4,10 +4,10 @@ import java.time.LocalDate; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.reactive.mutiny.Mutiny; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java index 83c7bb07cf70e..c68e9e813d9db 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java @@ -2,11 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.inject.Inject; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.reactive.mutiny.Mutiny; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java index 063bbf4d71433..95982ea98dc89 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.reactive.singlepersistenceunit; -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 public class DefaultEntity { diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java index 64d72e3ace611..2ddccd391be79 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.SessionFactory; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java index 7af087c248ea8..6e2f826d7836e 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageAnnotationTest.java @@ -5,7 +5,7 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; import org.jboss.logmanager.formatters.PatternFormatter; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java index 2592b675b1a13..01887a8cf8a26 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitPackageConfigurationTest.java @@ -5,7 +5,7 @@ import java.util.logging.Formatter; import java.util.logging.Level; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; import org.jboss.logmanager.formatters.PatternFormatter; diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java index 2fa155f6a19d7..253b68803aa8b 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/excludedpackage/ExcludedEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.reactive.singlepersistenceunit.entityassignment.excludedpackage; -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 public class ExcludedEntity { diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java index 7a1072d3cb749..f95f59133767f 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughannotation/EntityIncludedThroughPackageAnnotation.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.reactive.singlepersistenceunit.entityassignment.packageincludedthroughannotation; -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 public class EntityIncludedThroughPackageAnnotation { diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java index 1be8671a89a49..974055dafc117 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/entityassignment/packageincludedthroughconfig/EntityIncludedThroughPackageConfig.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.reactive.singlepersistenceunit.entityassignment.packageincludedthroughconfig; -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 public class EntityIncludedThroughPackageConfig { diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java index f6dae62380205..3aaac91e32e41 100644 --- a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java +++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/sql_load_script/FileNotFoundSqlLoadScriptTestCase.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/hibernate-reactive/runtime/pom.xml b/extensions/hibernate-reactive/runtime/pom.xml index ebf2d8c5192af..f4f48e52338d0 100644 --- a/extensions/hibernate-reactive/runtime/pom.xml +++ b/extensions/hibernate-reactive/runtime/pom.xml @@ -33,7 +33,7 @@ org.hibernate.reactive - hibernate-reactive-core + hibernate-reactive-core-jakarta diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java index 6d641de0e7987..9b0bad1e167c6 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java @@ -8,11 +8,11 @@ import java.util.Optional; import java.util.Set; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java index 56585250e4a1f..5f0ebd1d30c97 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java @@ -14,13 +14,13 @@ private ReactivePersistenceProviderSetup() { } public static void registerStaticInitPersistenceProvider() { - javax.persistence.spi.PersistenceProviderResolverHolder + jakarta.persistence.spi.PersistenceProviderResolverHolder .setPersistenceProviderResolver(new StaticInitHibernateReactivePersistenceProviderResolver()); } public static void registerRuntimePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig, Map> integrationRuntimeDescriptors) { - javax.persistence.spi.PersistenceProviderResolverHolder + jakarta.persistence.spi.PersistenceProviderResolverHolder .setPersistenceProviderResolver( new SingletonPersistenceProviderResolver( new FastBootHibernateReactivePersistenceProvider(hibernateOrmRuntimeConfig, diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java index e2a664cd5a8ec..0b7fecbf95405 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.reactive.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; -import javax.inject.Inject; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnit; import org.hibernate.reactive.common.spi.MutinyImplementor; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java index 2dd1639a0d44d..120c7baa6ee95 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.hibernate.reactive.common.spi.MutinyImplementor; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java index 0b47e1a334762..5256ca75172ab 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; /** * During the static init phase, we don't access the PersistenceProviderResolver. diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java index cd4bb55903af9..cbe1d56aac1d5 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.runtime.boot; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java index a1c94be01f6bd..817c2f2d77e3d 100644 --- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java +++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.function.BooleanSupplier; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceUnitInfo; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/ConfigPropertiesTest.java b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/ConfigPropertiesTest.java index 754b3bb146551..69bc445beff93 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/ConfigPropertiesTest.java +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/ConfigPropertiesTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/defaultpu/IndexedEntity.java b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/defaultpu/IndexedEntity.java index 0d064ed5cf533..12c78cae95b62 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/defaultpu/IndexedEntity.java +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/defaultpu/IndexedEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.coordination.outboxpolling.test.configuration.defaultpu; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/pu1/IndexedEntityForPU1.java b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/pu1/IndexedEntityForPU1.java index cf05a80b137e3..4e0c818bd3e19 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/pu1/IndexedEntityForPU1.java +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/java/io/quarkus/hibernate/search/orm/coordination/outboxpolling/test/configuration/pu1/IndexedEntityForPU1.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.coordination.outboxpolling.test.configuration.pu1; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/runtime/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/runtime/pom.xml index e1a203892cb1c..a701c04782af4 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/runtime/pom.xml +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/runtime/pom.xml @@ -32,14 +32,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling - - - - javax.persistence - javax.persistence-api - - + hibernate-search-mapper-orm-coordination-outbox-polling-jakarta diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchCdiProcessor.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchCdiProcessor.java index 6a11e32d701f3..5657ddddb40ed 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchCdiProcessor.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchCdiProcessor.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; import org.hibernate.search.mapper.orm.mapping.SearchMapping; import org.hibernate.search.mapper.orm.session.SearchSession; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigActiveFalseAndIndexedEntityTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigActiveFalseAndIndexedEntityTest.java index caa45dbfd1bf5..2f1b764605daf 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigActiveFalseAndIndexedEntityTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigActiveFalseAndIndexedEntityTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigEnabledFalseAndIndexedEntityTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigEnabledFalseAndIndexedEntityTest.java index bf77dd8fdce1e..da26204dd8120 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigEnabledFalseAndIndexedEntityTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/ConfigEnabledFalseAndIndexedEntityTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/CustomMappingAndSettingsTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/CustomMappingAndSettingsTest.java index 7fc328d4f3391..3aa27b0df3949 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/CustomMappingAndSettingsTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/CustomMappingAndSettingsTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; import org.hibernate.Session; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntity.java index 5ad1d68033482..49961c2b2e032 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntityInNamedBackend.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntityInNamedBackend.java index be8b1cbc8d060..6d95058d9eff3 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntityInNamedBackend.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/configuration/IndexedEntityInNamedBackend.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.configuration; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java index e18ea3212eeb5..d5d737b838091 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java @@ -3,12 +3,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.UserTransaction; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java index 24293f35c59a8..2d0700b173735 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.multiplepersistenceunits.defaultpu; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java index 6af36d0e6e04e..8609edeeccf32 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.multiplepersistenceunits.pu1; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java index 8620a6b10e328..652a6cdd46c38 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.multiplepersistenceunits.pu2; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java index 20e33f2d8fe03..3f9e668ab34ff 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.multiplepersistenceunits.pu3; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class PU3Entity { diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/IndexedEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/IndexedEntity.java index 591c58bc5f892..d4a886383330e 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/IndexedEntity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/IndexedEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.offline; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/StartOfflineTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/StartOfflineTest.java index c8cd81bf58b5a..05d115866d188 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/StartOfflineTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/offline/StartOfflineTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity; import org.hibernate.search.mapper.orm.mapping.SearchMapping; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java index f7069c5ca1ccb..2e89b1d6a3277 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.singlepersistenceunit; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java index 33bd03df55e24..b237f29d1e145 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity; import org.hibernate.search.mapper.orm.mapping.SearchMapping; diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/util/TransactionUtils.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/util/TransactionUtils.java index c43d1646b7f5c..9aa6bd3c661b6 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/util/TransactionUtils.java +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/orm/elasticsearch/test/util/TransactionUtils.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.search.orm.elasticsearch.test.util; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; public class TransactionUtils { private TransactionUtils() { diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml index 459f1b5e40116..2f63595535d7c 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml @@ -31,17 +31,8 @@ org.hibernate.search - hibernate-search-mapper-orm + hibernate-search-mapper-orm-jakarta - - - javax.persistence - javax.persistence-api - - jakarta.activation jakarta.activation-api diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/SearchExtension.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/SearchExtension.java index 88c4762423b6c..4571edd4af6b3 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/SearchExtension.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/SearchExtension.java @@ -11,8 +11,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java index 80619b2a2bcba..994e9caa7dc5f 100644 --- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java +++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java @@ -15,7 +15,7 @@ import java.util.function.BiConsumer; import java.util.function.Supplier; -import javax.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.inject.literal.NamedLiteral; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index 1893714d8b3a0..5c7e64ae43358 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -15,21 +15,21 @@ import java.util.function.Predicate; import java.util.regex.Pattern; -import javax.inject.Singleton; -import javax.validation.ClockProvider; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorFactory; -import javax.validation.MessageInterpolator; -import javax.validation.ParameterNameProvider; -import javax.validation.TraversableResolver; -import javax.validation.Valid; -import javax.validation.Validation; -import javax.validation.ValidationException; -import javax.validation.ValidatorFactory; -import javax.validation.executable.ValidateOnExecution; -import javax.validation.valueextraction.ValueExtractor; -import javax.ws.rs.Priorities; +import jakarta.inject.Singleton; +import jakarta.validation.ClockProvider; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorFactory; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.ParameterNameProvider; +import jakarta.validation.TraversableResolver; +import jakarta.validation.Valid; +import jakarta.validation.Validation; +import jakarta.validation.ValidationException; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ValidateOnExecution; +import jakarta.validation.valueextraction.ValueExtractor; +import jakarta.ws.rs.Priorities; import org.hibernate.validator.internal.metadata.core.ConstraintHelper; import org.hibernate.validator.messageinterpolation.AbstractMessageInterpolator; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowMultipleCascadedValidationOnReturnValuesTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowMultipleCascadedValidationOnReturnValuesTest.java index 587204da0b53d..729fdbe3cf01e 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowMultipleCascadedValidationOnReturnValuesTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowMultipleCascadedValidationOnReturnValuesTest.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.Validator; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.Validator; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowOverridingParameterConstraintsTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowOverridingParameterConstraintsTest.java index 09340bb2aa993..85bae6c20febf 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowOverridingParameterConstraintsTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowOverridingParameterConstraintsTest.java @@ -4,11 +4,11 @@ import java.util.Set; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowParameterConstraintsOnParallelMethodsTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowParameterConstraintsOnParallelMethodsTest.java index 54250c8bbb64f..a7515b371848d 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowParameterConstraintsOnParallelMethodsTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/AllowParameterConstraintsOnParallelMethodsTest.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test; -import javax.inject.Inject; -import javax.validation.Validator; -import javax.validation.constraints.NotNull; +import jakarta.inject.Inject; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotNull; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintExpressionLanguageFeatureLevelTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintExpressionLanguageFeatureLevelTest.java index f513348a2bdfb..d10db1cbd7a77 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintExpressionLanguageFeatureLevelTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintExpressionLanguageFeatureLevelTest.java @@ -12,13 +12,13 @@ import java.lang.annotation.Target; import java.util.Set; -import javax.inject.Inject; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.ConstraintViolation; -import javax.validation.Payload; -import javax.validation.Validator; +import jakarta.inject.Inject; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Payload; +import jakarta.validation.Validator; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintOnStaticMethodTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintOnStaticMethodTest.java index c33a85e5ed75a..ad5a04f7bf564 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintOnStaticMethodTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintOnStaticMethodTest.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Pattern; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Pattern; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java index 8b657216926f5..c6b61391559fc 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Pattern; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Pattern; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ContainerElementConstraintsTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ContainerElementConstraintsTest.java index cc043deda8fcb..195e0f6cc2742 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ContainerElementConstraintsTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ContainerElementConstraintsTest.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotBlank; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotBlank; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/CustomConfigurationViaBeansTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/CustomConfigurationViaBeansTest.java index 4fff54f2b928b..6a1f079f4aaa7 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/CustomConfigurationViaBeansTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/CustomConfigurationViaBeansTest.java @@ -10,18 +10,18 @@ import java.util.List; import java.util.Locale; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.ClockProvider; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorFactory; -import javax.validation.MessageInterpolator; -import javax.validation.ParameterNameProvider; -import javax.validation.Path; -import javax.validation.Path.Node; -import javax.validation.TraversableResolver; -import javax.validation.ValidationException; -import javax.validation.ValidatorFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.ClockProvider; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorFactory; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.ParameterNameProvider; +import jakarta.validation.Path; +import jakarta.validation.Path.Node; +import jakarta.validation.TraversableResolver; +import jakarta.validation.ValidationException; +import jakarta.validation.ValidatorFactory; import org.hibernate.validator.HibernateValidatorFactory; import org.hibernate.validator.internal.properties.DefaultGetterPropertySelectionStrategy; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/FailFastTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/FailFastTest.java index b9ee9e116172b..305b6a1413ec4 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/FailFastTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/FailFastTest.java @@ -5,15 +5,15 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.Valid; -import javax.validation.Validator; -import javax.validation.constraints.Email; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Valid; +import jakarta.validation.Validator; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/RepeatedConstraintsTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/RepeatedConstraintsTest.java index babbbf70d7309..aaeac56e6a67c 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/RepeatedConstraintsTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/RepeatedConstraintsTest.java @@ -14,14 +14,14 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Pattern; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Pattern; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/UserCountryNotSetValidatorLocaleTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/UserCountryNotSetValidatorLocaleTest.java index 7eead10336d8b..1a05101cd5254 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/UserCountryNotSetValidatorLocaleTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/UserCountryNotSetValidatorLocaleTest.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Pattern; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Pattern; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java index 0abec442499b2..846e9ae292863 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorForEarlyInitializedBeanTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorForEarlyInitializedBeanTest.java index 68e0c3313f27b..102c8d6bfe1c1 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorForEarlyInitializedBeanTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorForEarlyInitializedBeanTest.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.validator.test; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorFromValidationTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorFromValidationTest.java index d6617531a398b..af40da04c053a 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorFromValidationTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorFromValidationTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingInvalidTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingInvalidTest.java index 60ca4f68024ab..f2c3680b8cf72 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingInvalidTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingInvalidTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.inject.Inject; -import javax.validation.constraints.Max; +import jakarta.inject.Inject; +import jakarta.validation.constraints.Max; import org.eclipse.microprofile.config.Config; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingValidatorTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingValidatorTest.java index d5c38bdf59683..3b6370fd948ac 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingValidatorTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/config/ConfigMappingValidatorTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.constraints.Size; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelConstraint.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelConstraint.java index d2a626c8c7e79..eb5617185270d 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelConstraint.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelConstraint.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelValidator.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelValidator.java index 60bee5bd083ee..160bffc27491c 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelValidator.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/ClassLevelValidator.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.test.devmode; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ClassLevelValidator implements ConstraintValidator { @Override diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DependentTestBean.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DependentTestBean.java index 2557dcada50f0..0e17cc241399e 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DependentTestBean.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DependentTestBean.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.validator.test.devmode; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class DependentTestBean { diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java index d787dcd246f67..3392c61f2f740 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeConstraintValidationTest.java @@ -48,7 +48,7 @@ public void testPropertyConstraintHotReplacement() { .body(containsString("ok")); TEST.modifySourceFile("TestBean.java", s -> s.replace("// ", - "@javax.validation.constraints.NotNull(message=\"My property message\")")); + "@jakarta.validation.constraints.NotNull(message=\"My property message\")")); RestAssured.given() .header("Content-Type", "application/json") @@ -69,7 +69,7 @@ public void testMethodConstraintHotReplacement() { .body(containsString("mymessage")); TEST.modifySourceFile("DependentTestBean.java", s -> s.replace("/* */", - "@javax.validation.constraints.Size(max=1, message=\"My method message\")")); + "@jakarta.validation.constraints.Size(max=1, message=\"My method message\")")); RestAssured.given() .header("Content-Type", "application/json") diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeTestResource.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeTestResource.java index 3b2377ee66239..9f17a8aecf6e8 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeTestResource.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/DevModeTestResource.java @@ -1,14 +1,14 @@ package io.quarkus.hibernate.validator.test.devmode; -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; @Path("/test") public class DevModeTestResource { diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewConstraint.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewConstraint.java index 1f5b8c815ecc0..31f0cfc07d149 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewConstraint.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewConstraint.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewTestBean.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewTestBean.java index fed21ad884cd4..6a43ff08b0df0 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewTestBean.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewTestBean.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.validator.test.devmode; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class NewTestBean { @NotNull(message = "My new bean message") diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewValidator.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewValidator.java index 118ab4ce0cd40..0c72b2e039f8d 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewValidator.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/devmode/NewValidator.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.test.devmode; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class NewValidator implements ConstraintValidator { @Override diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java index a60a0d7dd803d..a62bf9c7c856e 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java @@ -10,9 +10,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; -import javax.validation.constraints.NotNull; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.constraints.NotNull; @Retention(RUNTIME) @Target({ FIELD, METHOD, ANNOTATION_TYPE, PARAMETER }) diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java index e2b62c73eef6d..c1249c670e6c4 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class TestInjectedBean { diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java index 208111599efb5..2c0c619318a57 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test.injection; -import javax.inject.Inject; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class TestInjectionValidator implements ConstraintValidator { diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/HibernateValidatorFactoryCustomizerTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/HibernateValidatorFactoryCustomizerTest.java index 0b6c9e81e6f82..c11b728be12a0 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/HibernateValidatorFactoryCustomizerTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/HibernateValidatorFactoryCustomizerTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleHibernateValidatorFactoryCustomizersTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleHibernateValidatorFactoryCustomizersTest.java index 36800e24ba143..7f40dbd67ed28 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleHibernateValidatorFactoryCustomizersTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleHibernateValidatorFactoryCustomizersTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleValidatorFactoryCustomizersTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleValidatorFactoryCustomizersTest.java index d19b5ec0a18e1..1a66ca25552e1 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleValidatorFactoryCustomizersTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MultipleValidatorFactoryCustomizersTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailHibernateValidatorFactoryCustomizer.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailHibernateValidatorFactoryCustomizer.java index 8ab073dfaa13f..5ffa4026115b4 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailHibernateValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailHibernateValidatorFactoryCustomizer.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.Email; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.Email; import org.hibernate.validator.BaseHibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidator.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidator.java index 5764a48df9435..91e0d5feb2737 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidator.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidator.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.constraints.Email; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.constraints.Email; public class MyEmailValidator implements ConstraintValidator { @Override public boolean isValid(CharSequence value, ConstraintValidatorContext context) { return "test1234@acme.com".contentEquals(value); } -} \ No newline at end of file +} diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidatorFactoryCustomizer.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidatorFactoryCustomizer.java index eedac6a219d0f..63783703022fe 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyEmailValidatorFactoryCustomizer.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.Email; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.Email; import org.hibernate.validator.BaseHibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleHibernateValidatorFactoryCustomizer.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleHibernateValidatorFactoryCustomizer.java index 89c3e156dc48a..2571fe8285b6d 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleHibernateValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleHibernateValidatorFactoryCustomizer.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.hibernate.validator.BaseHibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleValidatorFactoryCustomizer.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleValidatorFactoryCustomizer.java index ef1149fb28cb0..4f840f72e8189 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyMultipleValidatorFactoryCustomizer.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.hibernate.validator.BaseHibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumValidator.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumValidator.java index 8f661cbebb06f..57c8f2bfe1e7f 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumValidator.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumValidator.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.constraints.Min; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.constraints.Min; public class MyNumValidator implements ConstraintValidator { @Override public boolean isValid(Integer value, ConstraintValidatorContext context) { return value >= 0; } -} \ No newline at end of file +} diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberHibernateValidatorFactoryCustomizer.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberHibernateValidatorFactoryCustomizer.java index 0ef9fa4989b73..a25a72282ef4f 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberHibernateValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberHibernateValidatorFactoryCustomizer.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.Min; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.Min; import org.hibernate.validator.BaseHibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberValidatorFactoryCustomizer.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberValidatorFactoryCustomizer.java index c8a0ecd0aeac6..9cd093f6402e1 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/MyNumberValidatorFactoryCustomizer.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.test.validatorfactory; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.Min; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.Min; import org.hibernate.validator.BaseHibernateValidatorConfiguration; import org.hibernate.validator.cfg.ConstraintMapping; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryCustomizerTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryCustomizerTest.java index 9b6904326f11b..f919726875c26 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryCustomizerTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryCustomizerTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationCustomizerTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationCustomizerTest.java index fbf7974ff0509..9785e63086cbf 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationCustomizerTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationCustomizerTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationTest.java index 224379c236e97..8c819454dced6 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/validatorfactory/ValidatorFactoryFromValidationTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.inject.Inject; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.hibernate.validator.HibernateValidatorFactory; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/ApplicationScopedCustomValueExtractorTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/ApplicationScopedCustomValueExtractorTest.java index 3065ac937e16e..079d501438116 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/ApplicationScopedCustomValueExtractorTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/ApplicationScopedCustomValueExtractorTest.java @@ -2,12 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotBlank; -import javax.validation.valueextraction.ExtractedValue; -import javax.validation.valueextraction.ValueExtractor; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.valueextraction.ExtractedValue; +import jakarta.validation.valueextraction.ValueExtractor; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/NestedContainerTypeCustomValueExtractorTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/NestedContainerTypeCustomValueExtractorTest.java index 43c1507d5b46b..7b6e672ea4786 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/NestedContainerTypeCustomValueExtractorTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/NestedContainerTypeCustomValueExtractorTest.java @@ -2,12 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotBlank; -import javax.validation.valueextraction.ExtractedValue; -import javax.validation.valueextraction.ValueExtractor; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.valueextraction.ExtractedValue; +import jakarta.validation.valueextraction.ValueExtractor; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/SingletonCustomValueExtractorTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/SingletonCustomValueExtractorTest.java index 0c71782b5bd3e..91ce999aaa1e4 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/SingletonCustomValueExtractorTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/valueextractor/SingletonCustomValueExtractorTest.java @@ -2,12 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotBlank; -import javax.validation.valueextraction.ExtractedValue; -import javax.validation.valueextraction.ValueExtractor; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.valueextraction.ExtractedValue; +import jakarta.validation.valueextraction.ValueExtractor; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/hibernate-validator/runtime/pom.xml b/extensions/hibernate-validator/runtime/pom.xml index df18cf60093ef..e0cdc46659e27 100644 --- a/extensions/hibernate-validator/runtime/pom.xml +++ b/extensions/hibernate-validator/runtime/pom.xml @@ -27,8 +27,8 @@ - org.glassfish - jakarta.el + org.glassfish.expressly + expressly io.smallrye.config @@ -88,8 +88,8 @@ true - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api org.graalvm.nativeimage diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/HibernateValidatorFactoryCustomizer.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/HibernateValidatorFactoryCustomizer.java index 2e09c793751bb..7855349c384e2 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/HibernateValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/HibernateValidatorFactoryCustomizer.java @@ -4,12 +4,12 @@ /** * Meant to be implemented by a CDI bean that provides arbitrary customization for the default - * {@link javax.validation.ValidatorFactory}. + * {@link jakarta.validation.ValidatorFactory}. *

* All implementations that are registered as CDI beans are taken into account when producing the default - * {@link javax.validation.ValidatorFactory}. + * {@link jakarta.validation.ValidatorFactory}. *

- * Customizers are applied in the order of {@link javax.annotation.Priority}. + * Customizers are applied in the order of {@link jakarta.annotation.Priority}. * * @deprecated Implement {@link ValidatorFactoryCustomizer} instead. */ diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/ValidatorFactoryCustomizer.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/ValidatorFactoryCustomizer.java index 81a0d04777616..03b3fd2027323 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/ValidatorFactoryCustomizer.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/ValidatorFactoryCustomizer.java @@ -4,12 +4,12 @@ /** * Meant to be implemented by a CDI bean that provides arbitrary customization for the default - * {@link javax.validation.ValidatorFactory}. + * {@link jakarta.validation.ValidatorFactory}. *

* All implementations that are registered as CDI beans are taken into account when producing the default - * {@link javax.validation.ValidatorFactory}. + * {@link jakarta.validation.ValidatorFactory}. *

- * Customizers are applied in the order of {@link javax.annotation.Priority}. + * Customizers are applied in the order of {@link jakarta.annotation.Priority}. */ public interface ValidatorFactoryCustomizer { diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ArcConstraintValidatorFactoryImpl.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ArcConstraintValidatorFactoryImpl.java index 719d597cf4159..6662d05dfb3f7 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ArcConstraintValidatorFactoryImpl.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ArcConstraintValidatorFactoryImpl.java @@ -5,9 +5,9 @@ import java.util.IdentityHashMap; import java.util.Map; -import javax.enterprise.context.Dependent; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorFactory; +import jakarta.enterprise.context.Dependent; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorFactory; import org.hibernate.validator.internal.util.privilegedactions.NewInstance; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/CloseAsNoopValidatorFactoryWrapper.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/CloseAsNoopValidatorFactoryWrapper.java index 600fb72a6dcd1..5763f259d66bd 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/CloseAsNoopValidatorFactoryWrapper.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/CloseAsNoopValidatorFactoryWrapper.java @@ -2,12 +2,12 @@ import java.time.Duration; -import javax.validation.ClockProvider; -import javax.validation.ConstraintValidatorFactory; -import javax.validation.MessageInterpolator; -import javax.validation.ParameterNameProvider; -import javax.validation.TraversableResolver; -import javax.validation.Validator; +import jakarta.validation.ClockProvider; +import jakarta.validation.ConstraintValidatorFactory; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.ParameterNameProvider; +import jakarta.validation.TraversableResolver; +import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidatorContext; import org.hibernate.validator.HibernateValidatorFactory; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateBeanValidationConfigValidator.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateBeanValidationConfigValidator.java index 13aafb261b8c6..774e7a5e3c7e9 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateBeanValidationConfigValidator.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateBeanValidationConfigValidator.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.validator.runtime; -import javax.validation.Validator; +import jakarta.validation.Validator; import io.smallrye.config.validator.BeanValidationConfigValidator; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java index 635dbaf3be022..fd24d663fda7e 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java @@ -6,14 +6,14 @@ import java.util.Set; import java.util.function.Supplier; -import javax.validation.ClockProvider; -import javax.validation.ConstraintValidatorFactory; -import javax.validation.MessageInterpolator; -import javax.validation.ParameterNameProvider; -import javax.validation.TraversableResolver; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.valueextraction.ValueExtractor; +import jakarta.validation.ClockProvider; +import jakarta.validation.ConstraintValidatorFactory; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.ParameterNameProvider; +import jakarta.validation.TraversableResolver; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.valueextraction.ValueExtractor; import org.hibernate.validator.HibernateValidatorFactory; import org.hibernate.validator.PredefinedScopeHibernateValidator; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/TraverseAllTraversableResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/TraverseAllTraversableResolver.java index ab49b703fb391..56c9ac0fbe4a9 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/TraverseAllTraversableResolver.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/TraverseAllTraversableResolver.java @@ -2,9 +2,9 @@ import java.lang.annotation.ElementType; -import javax.validation.Path; -import javax.validation.Path.Node; -import javax.validation.TraversableResolver; +import jakarta.validation.Path; +import jakarta.validation.Path.Node; +import jakarta.validation.TraversableResolver; class TraverseAllTraversableResolver implements TraversableResolver { diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidationSupport.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidationSupport.java index 444defaf83fd9..ff3e32843e53e 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidationSupport.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidationSupport.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.validator.runtime; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.hibernate.validator.HibernateValidatorFactory; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorHolder.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorHolder.java index e039659986499..d6651d8354503 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorHolder.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorHolder.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.validator.runtime; -import javax.validation.Validator; +import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidatorFactory; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorProvider.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorProvider.java index 06af13698972e..40490548aef99 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorProvider.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ValidatorProvider.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.validator.runtime; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; -import javax.validation.Validator; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; +import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidatorFactory; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java index a261230842a9f..b7304743d1e2d 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java @@ -6,15 +6,15 @@ import java.util.Iterator; import java.util.Set; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.interceptor.InvocationContext; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ElementKind; -import javax.validation.Path; -import javax.validation.Validator; -import javax.validation.executable.ExecutableValidator; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.interceptor.InvocationContext; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ElementKind; +import jakarta.validation.Path; +import jakarta.validation.Validator; +import jakarta.validation.executable.ExecutableValidator; /** * NOTE: this is a copy of the interceptor present in hibernate-validator-cdi. diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidated.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidated.java index 70694c89efd74..2aa155a2328cc 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidated.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidated.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; /** * Marker class to indicate a method should be validated. diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java index 3033666274f01..330bed7692ae1 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.hibernate.validator.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @MethodValidated @Interceptor diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java index da207f41624c6..0ae7e3769718f 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java @@ -2,9 +2,9 @@ import java.util.Iterator; -import javax.validation.ConstraintViolation; -import javax.validation.ElementKind; -import javax.validation.Path.Node; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ElementKind; +import jakarta.validation.Path.Node; import org.jboss.resteasy.api.validation.ConstraintType; import org.jboss.resteasy.resteasy_jaxrs.i18n.Messages; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java index 4bfb3d358d832..7805f7684ea75 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; /** * Marker class to indicate a JAX-RS end point should be validated. diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java index 0d891dc9109d8..f844dc545a6af 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java @@ -7,15 +7,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveEndPointValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveEndPointValidationInterceptor.java index fe4db63f03cf3..714f0237d4d76 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveEndPointValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveEndPointValidationInterceptor.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.validator.runtime.jaxrs; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.validation.ConstraintViolationException; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.validation.ConstraintViolationException; import io.quarkus.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationException.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationException.java index abcdda7f9b7f5..f8f0921bb4ddd 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationException.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationException.java @@ -2,11 +2,11 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; /** - * Wrapper around a {@link javax.validation.ConstraintViolationException}, + * Wrapper around a {@link jakarta.validation.ConstraintViolationException}, * used to mark a constraint violation as relative to a REST endpoint call. *

* Those violations are handled differently than violations from other, internal components: diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationExceptionMapper.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationExceptionMapper.java index f8277aee7c77b..1ac209802307d 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationExceptionMapper.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveViolationExceptionMapper.java @@ -8,16 +8,16 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ElementKind; -import javax.validation.Path; -import javax.validation.ValidationException; -import javax.ws.rs.core.MediaType; -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.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ElementKind; +import jakarta.validation.Path; +import jakarta.validation.ValidationException; +import jakarta.ws.rs.core.MediaType; +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.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java index 802ea9d9f5b67..e79579f5818ff 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.ws.rs.core.MediaType; +import jakarta.validation.ConstraintViolation; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.api.validation.ResteasyViolationException; import org.jboss.resteasy.core.ResteasyContext; @@ -12,7 +12,7 @@ import org.jboss.resteasy.spi.validation.ConstraintTypeUtil; /** - * Wrapper around a {@link javax.validation.ConstraintViolationException}, + * Wrapper around a {@link jakarta.validation.ConstraintViolationException}, * used to mark a constraint violation as relative to a REST endpoint call. *

* Those violations are handled differently than violations from other, internal components: diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionMapper.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionMapper.java index baafa604b30e3..62344f17bbeed 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionMapper.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionMapper.java @@ -1,14 +1,14 @@ package io.quarkus.hibernate.validator.runtime.jaxrs; -import javax.validation.ValidationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.validation.ValidationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.api.validation.ResteasyViolationException; import org.jboss.resteasy.api.validation.Validation; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ValidatorMediaTypeUtil.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ValidatorMediaTypeUtil.java index 90e5ac4f82323..600a7d70df480 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ValidatorMediaTypeUtil.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ValidatorMediaTypeUtil.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * Utility class to deal with MediaTypes in JAX-RS endpoints. diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ViolationReport.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ViolationReport.java index ab3955ddcac0c..5edd54e4d5f79 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ViolationReport.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ViolationReport.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * As spec doesn't say anything about the report format, diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/LocaleResolversWrapper.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/LocaleResolversWrapper.java index 53b5d41217a0a..0378d469cca31 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/LocaleResolversWrapper.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/LocaleResolversWrapper.java @@ -2,10 +2,10 @@ import java.util.Locale; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.hibernate.validator.spi.messageinterpolation.LocaleResolver; import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyClassicLocaleResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyClassicLocaleResolver.java index 237df733e51b2..36c3e1bb1477c 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyClassicLocaleResolver.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyClassicLocaleResolver.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Map; -import javax.inject.Singleton; -import javax.ws.rs.core.HttpHeaders; +import jakarta.inject.Singleton; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.core.ResteasyContext; diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java index e40a354c3e221..dcaea0a941828 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/locale/ResteasyReactiveLocaleResolver.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; import io.vertx.core.MultiMap; diff --git a/extensions/hibernate-validator/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/extensions/hibernate-validator/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers similarity index 100% rename from extensions/hibernate-validator/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers rename to extensions/hibernate-validator/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml index d938542910d32..6ed6bde6be56d 100644 --- a/extensions/infinispan-client/runtime/pom.xml +++ b/extensions/infinispan-client/runtime/pom.xml @@ -63,7 +63,7 @@ org.infinispan - infinispan-client-hotrod + infinispan-client-hotrod-jakarta org.infinispan diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidate.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidate.java index 865e8e79019ef..d3056b4ef2c6b 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidate.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidate.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import io.quarkus.infinispan.client.CacheInvalidate.List; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidateAll.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidateAll.java index e93a9258f67b5..e25b9311ccd36 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidateAll.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheInvalidateAll.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import io.quarkus.infinispan.client.CacheInvalidateAll.List; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheResult.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheResult.java index 02a77312d76cb..6c1ac7a1e5c8e 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheResult.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/CacheResult.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; /** * When a method annotated with {@link CacheResult} is invoked, Quarkus will use the method argument as key and use it to check diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/Remote.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/Remote.java index 66890ca41f351..08b023d32b889 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/Remote.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/Remote.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; /** * Qualifier used to specify which remote cache will be injected. diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java index 15ea700883c3a..f87311b1efdcb 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java @@ -8,15 +8,15 @@ import java.util.Scanner; import java.util.Set; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInterceptor.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInterceptor.java index 1e5cc904f1d74..3b4d5826c63ad 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInterceptor.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInterceptor.java @@ -8,9 +8,9 @@ import java.util.concurrent.CompletionStage; import java.util.function.Supplier; -import javax.inject.Inject; -import javax.interceptor.Interceptor.Priority; -import javax.interceptor.InvocationContext; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor.Priority; +import jakarta.interceptor.InvocationContext; import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.commons.CacheException; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateAllInterceptor.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateAllInterceptor.java index 711da1d49d7f5..32d53f7aa2af0 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateAllInterceptor.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateAllInterceptor.java @@ -4,10 +4,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.commons.CacheException; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateInterceptor.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateInterceptor.java index f533c16ca2942..a6325346ebd8c 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateInterceptor.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheInvalidateInterceptor.java @@ -5,10 +5,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.commons.CacheException; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheResultInterceptor.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheResultInterceptor.java index 2fc4507f83f1e..a420b2684ad26 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheResultInterceptor.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/CacheResultInterceptor.java @@ -4,11 +4,11 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.commons.CacheException; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/SynchronousInfinispanGet.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/SynchronousInfinispanGet.java index 540fa909f8886..caa706102e39d 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/SynchronousInfinispanGet.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/cache/SynchronousInfinispanGet.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SynchronousInfinispanGet { diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/health/InfinispanHealthCheck.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/health/InfinispanHealthCheck.java index 1c77a269bb44b..5f9772dea4497 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/health/InfinispanHealthCheck.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/health/InfinispanHealthCheck.java @@ -3,8 +3,8 @@ import java.util.Arrays; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java index 065b5e6efcc5b..092395e76e026 100644 --- a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java +++ b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java @@ -13,8 +13,8 @@ import java.util.Optional; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonAcceptCaseInsensitiveEnumsTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonAcceptCaseInsensitiveEnumsTest.java index 4f924ca5f476b..f3432569ebe60 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonAcceptCaseInsensitiveEnumsTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonAcceptCaseInsensitiveEnumsTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonClassNamePropertyNameStrategyTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonClassNamePropertyNameStrategyTest.java index 88b6960da59ea..fdc02b708a427 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonClassNamePropertyNameStrategyTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonClassNamePropertyNameStrategyTest.java @@ -1,6 +1,6 @@ package io.quarkus.jackson.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java index 2ec4130b7f05c..d7f120ae71d7a 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java @@ -5,7 +5,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java index f13a896c2f8c8..db53d96ddedd8 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java @@ -5,8 +5,8 @@ import java.time.zone.ZoneRulesException; import java.util.Date; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansNotSetTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansNotSetTest.java index f87e648435f82..630c17a992750 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansNotSetTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansNotSetTest.java @@ -1,6 +1,6 @@ package io.quarkus.jackson.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansSetTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansSetTest.java index d437165e25733..c27403fc737b5 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansSetTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnEmptyBeansSetTest.java @@ -1,6 +1,6 @@ package io.quarkus.jackson.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java index 039fbb0d9dcd9..c8ad9d282682a 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java @@ -1,6 +1,6 @@ package io.quarkus.jackson.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFieldNamePropertyNameStrategyTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFieldNamePropertyNameStrategyTest.java index c3f13399b0b27..8f78da5d96ab6 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFieldNamePropertyNameStrategyTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFieldNamePropertyNameStrategyTest.java @@ -1,6 +1,6 @@ package io.quarkus.jackson.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.java index b99971101e37f..2c00985e02659 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.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.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithCustomizerTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithCustomizerTest.java index 98aceaa3b0be9..630fa65a65890 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithCustomizerTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithCustomizerTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithoutCustomizerTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithoutCustomizerTest.java index 0dd321f6afbf9..93eecd11ca560 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithoutCustomizerTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonMixinsWithoutCustomizerTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java index c2a424acd85d1..5a243e03723e5 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java @@ -6,7 +6,7 @@ import java.time.ZonedDateTime; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java index c31a62a3bffec..e14da1cb4f528 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java @@ -5,7 +5,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsDisabledTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsDisabledTest.java index 96fd82f3c892d..b5d646a014340 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsDisabledTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsDisabledTest.java @@ -4,7 +4,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsEnabledTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsEnabledTest.java index 307144d6d2d98..7983edc0f9fe6 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsEnabledTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDurationsAsTimestampsEnabledTest.java @@ -4,7 +4,7 @@ import java.time.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java index 7ad94301b52cd..20ea1a89a2eb1 100644 --- a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java +++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java @@ -6,8 +6,8 @@ import java.time.ZonedDateTime; import java.util.ArrayList; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java index 1ab6e7ceca49c..0675633a7e99e 100644 --- a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java +++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.TimeZone; -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 com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/CommaParseJaegerConfigurationTest.java b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/CommaParseJaegerConfigurationTest.java index 95e764f818b01..a6400b1e1db24 100644 --- a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/CommaParseJaegerConfigurationTest.java +++ b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/CommaParseJaegerConfigurationTest.java @@ -5,7 +5,7 @@ import java.text.NumberFormat; import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java index d96e95470b6e8..3e0c864aeee0a 100644 --- a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java +++ b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/JaegerMetricsTestCase.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/QuarkusJaegerTracerTest.java b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/QuarkusJaegerTracerTest.java index c6b21f731723e..1302b401001b8 100644 --- a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/QuarkusJaegerTracerTest.java +++ b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/QuarkusJaegerTracerTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; diff --git a/extensions/jaeger/runtime/pom.xml b/extensions/jaeger/runtime/pom.xml index e89669de47d9c..3f02d002fe8ac 100644 --- a/extensions/jaeger/runtime/pom.xml +++ b/extensions/jaeger/runtime/pom.xml @@ -36,8 +36,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation jakarta.annotation diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java index 1e9ef522778e0..e912d406b49e2 100644 --- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java +++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java @@ -1,8 +1,8 @@ package io.quarkus.jaeger.runtime; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/ZipkinReporterProvider.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/ZipkinReporterProvider.java index 5f94d47fa4e33..0ece5c46cb821 100644 --- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/ZipkinReporterProvider.java +++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/ZipkinReporterProvider.java @@ -1,7 +1,7 @@ package io.quarkus.jaeger.runtime; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; @Singleton public class ZipkinReporterProvider { diff --git a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java index a8b8a8a9f4e81..fb1857bc3c2a5 100644 --- a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java +++ b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java @@ -9,39 +9,39 @@ import java.util.List; import java.util.stream.Stream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.annotation.XmlAccessOrder; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttachmentRef; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlIDREF; -import javax.xml.bind.annotation.XmlInlineBinaryData; -import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlMimeType; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSchemaTypes; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.annotation.XmlAccessOrder; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttachmentRef; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlIDREF; +import jakarta.xml.bind.annotation.XmlInlineBinaryData; +import jakarta.xml.bind.annotation.XmlList; +import jakarta.xml.bind.annotation.XmlMimeType; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSchemaTypes; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; @@ -119,54 +119,54 @@ class JaxbProcessor { private static final List IGNORE_TYPES = List.of(DotName.createSimple("javax.xml.datatype.XMLGregorianCalendar")); private static final List NATIVE_PROXY_DEFINITIONS = List.of( - "com.sun.xml.bind.marshaller.CharacterEscapeHandler", + "org.glassfish.jaxb.core.marshaller.CharacterEscapeHandler", "com.sun.xml.txw2.output.CharacterEscapeHandler", - "com.sun.xml.bind.v2.schemagen.episode.Bindings", - "com.sun.xml.bind.v2.schemagen.episode.SchemaBindings", - "com.sun.xml.bind.v2.schemagen.episode.Klass", - "com.sun.xml.bind.v2.schemagen.episode.Package", - "com.sun.xml.bind.v2.schemagen.xmlschema.Annotated", - "com.sun.xml.bind.v2.schemagen.xmlschema.Annotation", - "com.sun.xml.bind.v2.schemagen.xmlschema.Any", - "com.sun.xml.bind.v2.schemagen.xmlschema.Appinfo", - "com.sun.xml.bind.v2.schemagen.xmlschema.AttrDecls", - "com.sun.xml.bind.v2.schemagen.xmlschema.AttributeType", - "com.sun.xml.bind.v2.schemagen.xmlschema.ComplexContent", - "com.sun.xml.bind.v2.schemagen.xmlschema.ComplexExtension", - "com.sun.xml.bind.v2.schemagen.xmlschema.ComplexRestriction", - "com.sun.xml.bind.v2.schemagen.xmlschema.ComplexType", - "com.sun.xml.bind.v2.schemagen.xmlschema.ComplexTypeHost", - "com.sun.xml.bind.v2.schemagen.xmlschema.ComplexTypeModel", - "com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer", - "com.sun.xml.bind.v2.schemagen.xmlschema.Documentation", - "com.sun.xml.bind.v2.schemagen.xmlschema.Element", - "com.sun.xml.bind.v2.schemagen.xmlschema.ExplicitGroup", - "com.sun.xml.bind.v2.schemagen.xmlschema.ExtensionType", - "com.sun.xml.bind.v2.schemagen.xmlschema.FixedOrDefault", - "com.sun.xml.bind.v2.schemagen.xmlschema.Import", - "com.sun.xml.bind.v2.schemagen.xmlschema.List", - "com.sun.xml.bind.v2.schemagen.xmlschema.LocalAttribute", - "com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement", - "com.sun.xml.bind.v2.schemagen.xmlschema.NestedParticle", - "com.sun.xml.bind.v2.schemagen.xmlschema.NoFixedFacet", - "com.sun.xml.bind.v2.schemagen.xmlschema.Occurs", - "com.sun.xml.bind.v2.schemagen.xmlschema.Particle", - "com.sun.xml.bind.v2.schemagen.xmlschema.Redefinable", - "com.sun.xml.bind.v2.schemagen.xmlschema.Schema", - "com.sun.xml.bind.v2.schemagen.xmlschema.SchemaTop", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleContent", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleDerivation", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleExtension", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleRestriction", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleRestrictionModel", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleType", - "com.sun.xml.bind.v2.schemagen.xmlschema.SimpleTypeHost", - "com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelAttribute", - "com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelElement", - "com.sun.xml.bind.v2.schemagen.xmlschema.TypeDefParticle", - "com.sun.xml.bind.v2.schemagen.xmlschema.TypeHost", - "com.sun.xml.bind.v2.schemagen.xmlschema.Union", - "com.sun.xml.bind.v2.schemagen.xmlschema.Wildcard", + "org.glassfish.jaxb.core.v2.schemagen.episode.Bindings", + "org.glassfish.jaxb.core.v2.schemagen.episode.SchemaBindings", + "org.glassfish.jaxb.core.v2.schemagen.episode.Klass", + "org.glassfish.jaxb.core.v2.schemagen.episode.Package", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Annotated", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Annotation", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Any", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Appinfo", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.AttrDecls", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.AttributeType", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ComplexContent", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ComplexExtension", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ComplexRestriction", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ComplexType", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ComplexTypeHost", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ComplexTypeModel", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ContentModelContainer", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Documentation", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Element", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ExplicitGroup", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ExtensionType", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.FixedOrDefault", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Import", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.List", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.LocalAttribute", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.LocalElement", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.NestedParticle", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.NoFixedFacet", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Occurs", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Particle", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Redefinable", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Schema", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SchemaTop", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleContent", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleDerivation", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleExtension", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleRestriction", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleRestrictionModel", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleType", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.SimpleTypeHost", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.TopLevelAttribute", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.TopLevelElement", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.TypeDefParticle", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.TypeHost", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Union", + "org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Wildcard", "com.sun.xml.txw2.TypedXmlWriter"); @BuildStep @@ -221,7 +221,7 @@ void processAnnotationsAndIndexFiles( } if (!index.getAnnotations(XML_ANY_ELEMENT).isEmpty()) { - addReflectiveClass(reflectiveClass, false, false, "javax.xml.bind.annotation.W3CDomHandler"); + addReflectiveClass(reflectiveClass, false, false, "jakarta.xml.bind.annotation.W3CDomHandler"); } JAXB_ANNOTATIONS.stream() @@ -232,7 +232,7 @@ void processAnnotationsAndIndexFiles( // Register @XmlSeeAlso proxyDefinitions.produce(new NativeImageProxyDefinitionBuildItem(XmlSeeAlso.class.getName(), - "com.sun.xml.bind.v2.model.annotation.Locatable")); + "org.glassfish.jaxb.core.v2.model.annotation.Locatable")); for (AnnotationInstance xmlSeeAlsoAnn : index.getAnnotations(XML_SEE_ALSO)) { AnnotationValue value = xmlSeeAlsoAnn.value(); Type[] types = value.asClassArray(); @@ -265,14 +265,14 @@ void registerClasses( BuildProducer providerItem, BuildProducer reflectiveClass, BuildProducer resourceBundle) { - addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.bind.v2.ContextFactory"); + addReflectiveClass(reflectiveClass, true, false, "org.glassfish.jaxb.runtime.v2.ContextFactory"); addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.internal.stream.XMLInputFactoryImpl"); addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.internal.stream.XMLOutputFactoryImpl"); addReflectiveClass(reflectiveClass, true, false, "com.sun.org.apache.xpath.internal.functions.FuncNot"); addReflectiveClass(reflectiveClass, true, false, "com.sun.org.apache.xerces.internal.impl.dv.xs.SchemaDVFactoryImpl"); - addResourceBundle(resourceBundle, "javax.xml.bind.Messages"); - addResourceBundle(resourceBundle, "javax.xml.bind.helpers.Messages"); + addResourceBundle(resourceBundle, "jakarta.xml.bind.Messages"); + addResourceBundle(resourceBundle, "jakarta.xml.bind.helpers.Messages"); nativeImageProps .produce(new NativeImageSystemPropertyBuildItem("com.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize", "true")); @@ -282,7 +282,8 @@ void registerClasses( .forEach(className -> addReflectiveClass(reflectiveClass, true, false, className)); providerItem - .produce(new ServiceProviderBuildItem(JAXBContext.class.getName(), "com.sun.xml.bind.v2.ContextFactory")); + .produce(new ServiceProviderBuildItem(JAXBContext.class.getName(), + "org.glassfish.jaxb.runtime.v2.ContextFactory")); } @BuildStep diff --git a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/CustomJaxbContextCustomizer.java b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/CustomJaxbContextCustomizer.java index dd9213cadc501..2e9797c01f610 100644 --- a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/CustomJaxbContextCustomizer.java +++ b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/CustomJaxbContextCustomizer.java @@ -1,8 +1,8 @@ package io.quarkus.jaxb.deployment; -import javax.inject.Singleton; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; +import jakarta.inject.Singleton; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; import io.quarkus.jaxb.runtime.JaxbContextCustomizer; diff --git a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/InjectJaxbContextTest.java b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/InjectJaxbContextTest.java index 308ffe5a4d2fa..44041e1533fef 100644 --- a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/InjectJaxbContextTest.java +++ b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/InjectJaxbContextTest.java @@ -5,11 +5,11 @@ import java.io.StringWriter; -import javax.inject.Inject; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.inject.Inject; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.junit.jupiter.api.Test; diff --git a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/Person.java b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/Person.java index c038dce2d5348..d577429e6b547 100644 --- a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/Person.java +++ b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/Person.java @@ -1,8 +1,8 @@ package io.quarkus.jaxb.deployment; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/info/package-info.java b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/info/package-info.java index f771bed3da497..d4f987a44af81 100644 --- a/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/info/package-info.java +++ b/extensions/jaxb/deployment/src/test/java/io/quarkus/jaxb/deployment/info/package-info.java @@ -6,5 +6,5 @@ }) package io.quarkus.jaxb.deployment.info; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/extensions/jaxb/runtime/pom.xml b/extensions/jaxb/runtime/pom.xml index 44f49a71aeb53..253895f4381bc 100644 --- a/extensions/jaxb/runtime/pom.xml +++ b/extensions/jaxb/runtime/pom.xml @@ -38,8 +38,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api @@ -51,7 +51,7 @@ javax.xml.bind:jaxb-api - jakarta.xml.bind:jakarta.xml.bind-api + org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec diff --git a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextCustomizer.java b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextCustomizer.java index fd354b24261da..8f1909d1e45a1 100644 --- a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextCustomizer.java +++ b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextCustomizer.java @@ -2,10 +2,10 @@ import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.Unmarshaller; /** * Meant to be implemented by a CDI bean that provides arbitrary customization for the default {@link JAXBContext}. diff --git a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java index 0d1217fca9e6c..7e42e1ba226f4 100644 --- a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java +++ b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/JaxbContextProducer.java @@ -6,15 +6,15 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import io.quarkus.arc.DefaultBean; diff --git a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/graal/JAXBSubstitutions.java b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/graal/JAXBSubstitutions.java index d1c236671057e..36d2abb05f48c 100644 --- a/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/graal/JAXBSubstitutions.java +++ b/extensions/jaxb/runtime/src/main/java/io/quarkus/jaxb/runtime/graal/JAXBSubstitutions.java @@ -6,17 +6,18 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlSeeAlso; + +import org.glassfish.jaxb.core.v2.model.annotation.Locatable; +import org.glassfish.jaxb.runtime.v2.model.annotation.LocatableAnnotation; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.RecomputeFieldValue; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; -import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.annotation.LocatableAnnotation; -@TargetClass(className = "com.sun.xml.bind.v2.model.nav.ReflectionNavigator") -final class Target_com_sun_xml_bind_v2_model_nav_ReflectionNavigator { +@TargetClass(className = "org.glassfish.jaxb.core.v2.model.nav.ReflectionNavigator") +final class Target_org_glassfish_jaxb_core_v2_model_nav_ReflectionNavigator { @Substitute public Field[] getEnumConstants(Class clazz) { @@ -35,26 +36,8 @@ public Field[] getEnumConstants(Class clazz) { } -@TargetClass(className = "com.sun.xml.bind.v2.runtime.reflect.opt.AccessorInjector") -@Substitute -final class Target_com_sun_xml_bind_v2_runtime_reflect_opt_AccessorInjector { - - /** - * Loads the optimized class and returns it. - * - * @return null - * if it fails for some reason. - */ - @Substitute() - public static Class prepare( - Class beanClass, String templateClassName, String newClassName, String... replacements) { - return null; - } - -} - -@TargetClass(className = "com.sun.xml.bind.v2.model.annotation.RuntimeInlineAnnotationReader") -final class Target_com_sun_xml_bind_v2_model_annotation_RuntimeInlineAnnotationReader { +@TargetClass(className = "org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeInlineAnnotationReader") +final class Target_org_glassfish_jaxb_runtime_v2_model_annotation_RuntimeInlineAnnotationReader { @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = HashMap.class) diff --git a/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JakartaEnablement.java b/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JakartaEnablement.java index 777fa15c04650..ce8ec45c8ad26 100644 --- a/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JakartaEnablement.java +++ b/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JakartaEnablement.java @@ -23,7 +23,7 @@ import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; /** - * The DB2 driver is compiled using references to classes in the javax.transaction + * The DB2 driver is compiled using references to classes in the jakarta.transaction * package; we need to transform these to fix compatibility with jakarta.transaction. * We do this by leveraging the Eclipse Transformer project during Augmentation, so * that end users don't need to bother. diff --git a/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java b/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java index a285aa1e53773..c18a342d15aaa 100644 --- a/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java +++ b/extensions/jdbc/jdbc-db2/deployment/src/test/java/io/quarkus/jdbc/db2/deployment/DevServicesDB2DatasourceTestCase.java @@ -8,7 +8,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java b/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java index c9848ae168f78..fb7bf3cba779e 100644 --- a/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java b/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java index 7dc1d6265b979..8afe226f9fc49 100644 --- a/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java b/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java index 77718dc7ac54b..397da3a1e828a 100644 --- a/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-mssql/deployment/src/test/java/io/quarkus/jdbc/mssql/deployment/DevServicesMsSQLDatasourceTestCase.java @@ -8,7 +8,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java b/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java index d3e3cd9834e72..20dff2d606dd6 100644 --- a/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/DevServicesOracleDatasourceTestCase.java b/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/DevServicesOracleDatasourceTestCase.java index e2c59af38e454..23d68d7577e63 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/DevServicesOracleDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/DevServicesOracleDatasourceTestCase.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java index 6c0271e5f651d..ebea43c5d9a9f 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceDevModeTestCase.java @@ -2,7 +2,7 @@ import java.util.logging.Level; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceNamedWithUsernameTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceNamedWithUsernameTestCase.java index e888609d19b6c..b8d902a6228b7 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceNamedWithUsernameTestCase.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceNamedWithUsernameTestCase.java @@ -6,8 +6,8 @@ import java.sql.Connection; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java index a013ea3714e3d..d4e03d3a65ed6 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java @@ -9,7 +9,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceWithInitScriptTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceWithInitScriptTestCase.java index 7e1bab5f32c10..f6d34e4d84e3e 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceWithInitScriptTestCase.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceWithInitScriptTestCase.java @@ -6,9 +6,10 @@ import java.sql.Connection; import java.sql.ResultSet; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.inject.Inject; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/PgResource.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/PgResource.java index 52a412899eeb4..335d5670d8478 100644 --- a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/PgResource.java +++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/PgResource.java @@ -1,12 +1,12 @@ package io.quarkus.jdbc.postgresql.deployment; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.agroal.api.AgroalDataSource; import io.smallrye.common.annotation.Blocking; diff --git a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java index ca3e73bf65f8c..d7087f3fcdc8e 100644 --- a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java +++ b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java @@ -8,13 +8,13 @@ import java.util.Set; import java.util.function.Predicate; -import javax.inject.Singleton; -import javax.json.bind.JsonbConfig; -import javax.json.bind.adapter.JsonbAdapter; -import javax.json.bind.annotation.JsonbTypeDeserializer; -import javax.json.bind.annotation.JsonbTypeSerializer; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.bind.serializer.JsonbSerializer; +import jakarta.inject.Singleton; +import jakarta.json.bind.JsonbConfig; +import jakarta.json.bind.adapter.JsonbAdapter; +import jakarta.json.bind.annotation.JsonbTypeDeserializer; +import jakarta.json.bind.annotation.JsonbTypeSerializer; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.bind.serializer.JsonbSerializer; import org.eclipse.yasson.JsonBindingProvider; import org.eclipse.yasson.spi.JsonbComponentInstanceCreator; diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java index b33b2c99dd67e..67e6a5e6f1691 100644 --- a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java +++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java @@ -1,6 +1,6 @@ package io.quarkus.jsonb.deployment; -import javax.json.bind.annotation.JsonbTypeAdapter; +import jakarta.json.bind.annotation.JsonbTypeAdapter; @JsonbTypeAdapter(AlphaAdapter.class) public class Alpha { diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java index f76518f977e29..f0360beae6993 100644 --- a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java +++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java @@ -1,7 +1,7 @@ package io.quarkus.jsonb.deployment; -import javax.inject.Inject; -import javax.json.bind.adapter.JsonbAdapter; +import jakarta.inject.Inject; +import jakarta.json.bind.adapter.JsonbAdapter; // scope annotation is added automatically public class AlphaAdapter implements JsonbAdapter { diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java index 57b7f47278d24..d8df8e7bd0b47 100644 --- a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java +++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java @@ -1,6 +1,6 @@ package io.quarkus.jsonb.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Bravo { diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java index 5133812d176a5..799b5a33912b7 100644 --- a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java +++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.bind.Jsonb; -import javax.json.bind.adapter.JsonbAdapter; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.adapter.JsonbAdapter; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/jsonb/runtime/pom.xml b/extensions/jsonb/runtime/pom.xml index f6be233164027..93749d61689a8 100644 --- a/extensions/jsonb/runtime/pom.xml +++ b/extensions/jsonb/runtime/pom.xml @@ -16,13 +16,6 @@ org.eclipse yasson - - - - org.glassfish - jakarta.json - - io.quarkus diff --git a/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbConfigCustomizer.java b/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbConfigCustomizer.java index 26678b214adf0..8f1bf5cd58fd6 100644 --- a/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbConfigCustomizer.java +++ b/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbConfigCustomizer.java @@ -1,12 +1,12 @@ package io.quarkus.jsonb; -import javax.json.bind.JsonbConfig; +import jakarta.json.bind.JsonbConfig; /** * Meant to be implemented by a CDI bean that provided arbitrary customization for the default {@link JsonbConfig}. *

* All implementations (that are registered as CDI beans) are taken into account when producing the default {@link JsonbConfig}. - * The {@link JsonbConfig} is in turn used to produce the default {@link javax.json.bind.Jsonb} + * The {@link JsonbConfig} is in turn used to produce the default {@link jakarta.json.bind.Jsonb} *

* See also {@link JsonbProducer#jsonbConfig}. */ diff --git a/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbProducer.java b/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbProducer.java index ff39b5f1a8e77..c8f7941b2adf0 100644 --- a/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbProducer.java +++ b/extensions/jsonb/runtime/src/main/java/io/quarkus/jsonb/JsonbProducer.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; -import javax.json.bind.JsonbConfig; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.json.bind.JsonbConfig; import io.quarkus.arc.All; import io.quarkus.arc.DefaultBean; diff --git a/extensions/jsonb/runtime/src/test/java/io/quarkus/jsonb/JsonbUnitTest.java b/extensions/jsonb/runtime/src/test/java/io/quarkus/jsonb/JsonbUnitTest.java index 2054da437b9a5..0301b7af4df8f 100644 --- a/extensions/jsonb/runtime/src/test/java/io/quarkus/jsonb/JsonbUnitTest.java +++ b/extensions/jsonb/runtime/src/test/java/io/quarkus/jsonb/JsonbUnitTest.java @@ -4,10 +4,10 @@ import java.time.Instant; -import javax.json.bind.JsonbBuilder; -import javax.json.bind.adapter.JsonbAdapter; -import javax.json.bind.annotation.JsonbProperty; -import javax.json.bind.annotation.JsonbTypeAdapter; +import jakarta.json.bind.JsonbBuilder; +import jakarta.json.bind.adapter.JsonbAdapter; +import jakarta.json.bind.annotation.JsonbProperty; +import jakarta.json.bind.annotation.JsonbTypeAdapter; import org.junit.jupiter.api.Test; diff --git a/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java b/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java index 290ada77f5113..4211b39006d91 100644 --- a/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java +++ b/extensions/jsonp/deployment/src/main/java/io/quarkus/jsonp/deployment/JsonpProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.jsonp.deployment; -import org.glassfish.json.JsonProviderImpl; +import org.eclipse.parsson.JsonProviderImpl; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; diff --git a/extensions/jsonp/runtime/pom.xml b/extensions/jsonp/runtime/pom.xml index 9236a4d3fb0e5..898f6c578b3bd 100644 --- a/extensions/jsonp/runtime/pom.xml +++ b/extensions/jsonp/runtime/pom.xml @@ -18,8 +18,8 @@ quarkus-core - org.glassfish - jakarta.json + org.eclipse.parsson + parsson @@ -32,9 +32,11 @@ javax.json:javax.json-api org.glassfish:javax.json + org.glassfish:jakarta.json + org.eclipse.parsson:jakarta.json - org.glassfish:jakarta.json + org.eclipse.parsson:parsson jakarta.json:jakarta.json-api diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index fa3ae509b1181..feab7b0c5fc54 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java @@ -494,7 +494,7 @@ UnremovableBeanBuildItem ensureJsonParserAvailable() { "io.quarkus.jackson.ObjectMapperProducer", "com.fasterxml.jackson.databind.ObjectMapper", "io.quarkus.jsonb.JsonbProducer", - "javax.json.bind.Jsonb"); + "jakarta.json.bind.Jsonb"); } @BuildStep diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/health/KafkaHealthCheck.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/health/KafkaHealthCheck.java index e9b9a24bd265d..63bcb019b2953 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/health/KafkaHealthCheck.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/health/KafkaHealthCheck.java @@ -1,6 +1,6 @@ package io.quarkus.kafka.client.health; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.kafka.common.Node; import org.eclipse.microprofile.health.HealthCheck; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java index d9901b7bb12b5..7ccef1322f7ee 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java @@ -4,10 +4,10 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.kafka.clients.admin.*; import org.apache.kafka.common.acl.AccessControlEntryFilter; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java index 93e2ca309ab99..504bc66168f4e 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.Config; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java index 8a2340fd475de..eac860d8e1692 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaTopicClient.java @@ -9,8 +9,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java index 6cca91a20f37e..55d562a4023ac 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/ui/KafkaUiUtils.java @@ -13,7 +13,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.apache.kafka.clients.admin.ConsumerGroupDescription; import org.apache.kafka.clients.admin.DescribeClusterResult; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java index cff85c1860f20..49f223deafd31 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java @@ -6,7 +6,7 @@ import java.lang.reflect.Type; import java.util.Map; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.apache.kafka.common.serialization.Deserializer; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbProducer.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbProducer.java index 8b7af34221982..7ab06edc33f11 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbProducer.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbProducer.java @@ -1,7 +1,7 @@ package io.quarkus.kafka.client.serialization; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerde.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerde.java index 53a6aa36d94ae..c842148fe8c24 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerde.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerde.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerializer.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerializer.java index 17ba60dcdcd4a..fde1f9eaf263b 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerializer.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbSerializer.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.util.Map; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.apache.kafka.common.serialization.Serializer; diff --git a/extensions/kafka-client/runtime/src/test/java/io/quarkus/kafka/client/serde/JsonbSerdeTest.java b/extensions/kafka-client/runtime/src/test/java/io/quarkus/kafka/client/serde/JsonbSerdeTest.java index a3e74b92710c0..181f27893cf43 100644 --- a/extensions/kafka-client/runtime/src/test/java/io/quarkus/kafka/client/serde/JsonbSerdeTest.java +++ b/extensions/kafka-client/runtime/src/test/java/io/quarkus/kafka/client/serde/JsonbSerdeTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java index 401a08a509d74..f9c87cf9b0ddc 100644 --- a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java +++ b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.util.Properties; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.apache.kafka.common.serialization.Serdes.ByteArraySerde; import org.apache.kafka.streams.StreamsConfig; diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java index 152cd45bbed1f..4318cc16c35d2 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java +++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java @@ -21,12 +21,12 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsStateHealthCheck.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsStateHealthCheck.java index 6737d43b4864e..d7ff0fb7bed36 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsStateHealthCheck.java +++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsStateHealthCheck.java @@ -1,7 +1,7 @@ package io.quarkus.kafka.streams.runtime.health; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.kafka.streams.KafkaStreams; import org.eclipse.microprofile.health.HealthCheck; diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsTopicsHealthCheck.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsTopicsHealthCheck.java index c96540fb63b58..84c23f440df87 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsTopicsHealthCheck.java +++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/health/KafkaStreamsTopicsHealthCheck.java @@ -6,9 +6,9 @@ import java.util.Set; import java.util.stream.Collectors; -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.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/keycloak-admin-client-common/runtime/src/main/java/io/quarkus/keycloak/admin/client/common/AutoCloseableDestroyer.java b/extensions/keycloak-admin-client-common/runtime/src/main/java/io/quarkus/keycloak/admin/client/common/AutoCloseableDestroyer.java index b4f5973e8ff7a..b06c19ba86f6d 100644 --- a/extensions/keycloak-admin-client-common/runtime/src/main/java/io/quarkus/keycloak/admin/client/common/AutoCloseableDestroyer.java +++ b/extensions/keycloak-admin-client-common/runtime/src/main/java/io/quarkus/keycloak/admin/client/common/AutoCloseableDestroyer.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.BeanDestroyer; diff --git a/extensions/keycloak-admin-client-reactive/deployment/src/main/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java b/extensions/keycloak-admin-client-reactive/deployment/src/main/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java index 275523af52608..36a45a5311265 100644 --- a/extensions/keycloak-admin-client-reactive/deployment/src/main/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java +++ b/extensions/keycloak-admin-client-reactive/deployment/src/main/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.keycloak.admin.client.reactive; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import org.jboss.jandex.DotName; import org.keycloak.admin.client.Keycloak; diff --git a/extensions/keycloak-admin-client-reactive/deployment/src/test/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientInjectionDevServicesTest.java b/extensions/keycloak-admin-client-reactive/deployment/src/test/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientInjectionDevServicesTest.java index 2067997178b8e..b2c20096410c6 100644 --- a/extensions/keycloak-admin-client-reactive/deployment/src/test/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientInjectionDevServicesTest.java +++ b/extensions/keycloak-admin-client-reactive/deployment/src/test/java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientInjectionDevServicesTest.java @@ -6,9 +6,9 @@ import java.util.List; -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 org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -52,4 +52,4 @@ public List getRoles() { } } -} \ No newline at end of file +} diff --git a/extensions/keycloak-admin-client-reactive/runtime/pom.xml b/extensions/keycloak-admin-client-reactive/runtime/pom.xml index 8660b35d01ab7..71044ae353d3f 100644 --- a/extensions/keycloak-admin-client-reactive/runtime/pom.xml +++ b/extensions/keycloak-admin-client-reactive/runtime/pom.xml @@ -29,12 +29,12 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation org.keycloak - keycloak-admin-client + keycloak-admin-client-jakarta org.jboss.resteasy diff --git a/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java b/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java index 09cdac5a52d79..275fc580fb2c8 100644 --- a/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java +++ b/extensions/keycloak-admin-client-reactive/runtime/src/main/java/io/quarkus/keycloak/admin/client/reactive/runtime/ResteasyReactiveClientProvider.java @@ -2,12 +2,13 @@ import java.util.List; -import javax.enterprise.inject.Instance; import javax.net.ssl.SSLContext; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; + +import jakarta.enterprise.inject.Instance; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.resteasy.reactive.client.impl.ClientBuilderImpl; diff --git a/extensions/keycloak-admin-client/deployment/src/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java b/extensions/keycloak-admin-client/deployment/src/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java index 05a8820f0bb74..cffedc987662d 100644 --- a/extensions/keycloak-admin-client/deployment/src/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java +++ b/extensions/keycloak-admin-client/deployment/src/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.keycloak.adminclient.deployment; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import org.jboss.jandex.DotName; import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl; diff --git a/extensions/keycloak-admin-client/deployment/src/test/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientInjectionDevServicesTest.java b/extensions/keycloak-admin-client/deployment/src/test/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientInjectionDevServicesTest.java index 93777fd846af0..023213d4b211b 100644 --- a/extensions/keycloak-admin-client/deployment/src/test/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientInjectionDevServicesTest.java +++ b/extensions/keycloak-admin-client/deployment/src/test/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientInjectionDevServicesTest.java @@ -6,9 +6,9 @@ import java.util.List; -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 org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/keycloak-admin-client/runtime/pom.xml b/extensions/keycloak-admin-client/runtime/pom.xml index c7b588295199d..0df3021cf55b8 100644 --- a/extensions/keycloak-admin-client/runtime/pom.xml +++ b/extensions/keycloak-admin-client/runtime/pom.xml @@ -41,12 +41,12 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation org.keycloak - keycloak-admin-client + keycloak-admin-client-jakarta org.jboss.resteasy diff --git a/extensions/keycloak-admin-client/runtime/src/main/java/io/quarkus/keycloak/adminclient/ResteasyKeycloakAdminClientRecorder.java b/extensions/keycloak-admin-client/runtime/src/main/java/io/quarkus/keycloak/adminclient/ResteasyKeycloakAdminClientRecorder.java index ece1316308464..9dda7e9c3c475 100644 --- a/extensions/keycloak-admin-client/runtime/src/main/java/io/quarkus/keycloak/adminclient/ResteasyKeycloakAdminClientRecorder.java +++ b/extensions/keycloak-admin-client/runtime/src/main/java/io/quarkus/keycloak/adminclient/ResteasyKeycloakAdminClientRecorder.java @@ -5,7 +5,8 @@ import java.util.function.Supplier; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; + +import jakarta.ws.rs.client.Client; import org.keycloak.admin.client.ClientBuilderWrapper; import org.keycloak.admin.client.Keycloak; diff --git a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java index d9c660e5bbc1d..6707c41021fd7 100644 --- a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java +++ b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.function.BooleanSupplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; diff --git a/extensions/keycloak-authorization/runtime/pom.xml b/extensions/keycloak-authorization/runtime/pom.xml index 20382323f7e58..6b5a2dea22a3f 100644 --- a/extensions/keycloak-authorization/runtime/pom.xml +++ b/extensions/keycloak-authorization/runtime/pom.xml @@ -33,8 +33,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation org.keycloak diff --git a/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java b/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java index 2f7f51c25ded5..20db1a13e572b 100644 --- a/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java +++ b/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java @@ -6,10 +6,10 @@ import java.util.function.BiFunction; import java.util.function.Function; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.keycloak.AuthorizationContext; import org.keycloak.adapters.authorization.KeycloakAdapterPolicyEnforcer; diff --git a/extensions/kotlin/runtime/pom.xml b/extensions/kotlin/runtime/pom.xml index 7c6a7545d6c2e..a92dd5751b376 100644 --- a/extensions/kotlin/runtime/pom.xml +++ b/extensions/kotlin/runtime/pom.xml @@ -19,22 +19,6 @@ io.quarkus quarkus-extension-maven-plugin - - org.jetbrains.kotlin:kotlin-stdlib-jdk8 - org.jetbrains.kotlin:kotlin-stdlib-jdk7 - org.jetbrains.kotlin:kotlin-reflect - org.jetbrains.kotlin:kotlin-stdlib - org.jetbrains.kotlin:kotlin-stdlib-common - org.jetbrains:annotations - - - org.jetbrains.kotlin:kotlin-stdlib-jdk8 - org.jetbrains.kotlin:kotlin-stdlib-jdk7 - org.jetbrains.kotlin:kotlin-reflect - org.jetbrains.kotlin:kotlin-stdlib - org.jetbrains.kotlin:kotlin-stdlib-common - org.jetbrains:annotations - - org.glassfish:jakarta.json + org.eclipse.parsson:parsson + jakarta.json:jakarta.json-api diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java index 196cb3b4c772d..5073b2022a8e2 100644 --- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java +++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java @@ -4,9 +4,9 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java index 1a9ca7e3266e2..90ba66710a81c 100644 --- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java +++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java @@ -1,8 +1,8 @@ package io.quarkus.mailer; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java index 188ce54f64d2b..48096fd2785d2 100644 --- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java +++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/i18n/MailMessageBundleTest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/mailer/runtime/pom.xml b/extensions/mailer/runtime/pom.xml index 1410d16c94311..58b54d7a95fda 100644 --- a/extensions/mailer/runtime/pom.xml +++ b/extensions/mailer/runtime/pom.xml @@ -51,8 +51,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation test diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Attachment.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Attachment.java index bc3e31c329600..7e11540c1eb99 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Attachment.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Attachment.java @@ -3,8 +3,7 @@ import java.io.File; import java.util.Iterator; import java.util.NoSuchElementException; - -import org.reactivestreams.Publisher; +import java.util.concurrent.Flow.Publisher; import io.smallrye.mutiny.Multi; diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Mail.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Mail.java index 07e094bcf5b6f..5ee50038adc2e 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Mail.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/Mail.java @@ -2,8 +2,7 @@ import java.io.File; import java.util.*; - -import org.reactivestreams.Publisher; +import java.util.concurrent.Flow.Publisher; /** * Represents an e-mail. diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/BlockingMailerImpl.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/BlockingMailerImpl.java index 180408da59106..2fcfb59e559b8 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/BlockingMailerImpl.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/BlockingMailerImpl.java @@ -1,7 +1,7 @@ package io.quarkus.mailer.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.mailer.Mail; import io.quarkus.mailer.Mailer; diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java index f91d76a000ef4..836bf0741ad4d 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java @@ -4,10 +4,10 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateProducer.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateProducer.java index c8c5d2e9c3942..9df0dba9ccdd2 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateProducer.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateProducer.java @@ -3,13 +3,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailerSupportProducer.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailerSupportProducer.java index 762ce87eba327..39239d07e2add 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailerSupportProducer.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailerSupportProducer.java @@ -1,7 +1,7 @@ package io.quarkus.mailer.runtime; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.quarkus.runtime.LaunchMode; diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MockMailboxImpl.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MockMailboxImpl.java index c391eb6b783e5..cc0c79d1e308e 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MockMailboxImpl.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MockMailboxImpl.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mailer.Mail; import io.quarkus.mailer.MockMailbox; diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java index e1942a1e7364a..302656b6e58a6 100644 --- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java +++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java @@ -6,14 +6,14 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Flow.Publisher; import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.logging.Logger; -import org.reactivestreams.Publisher; import io.quarkus.mailer.Attachment; import io.quarkus.mailer.Mail; diff --git a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/AttachmentTest.java b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/AttachmentTest.java index cc73a1ec7bad1..b1bd405c634e2 100644 --- a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/AttachmentTest.java +++ b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/AttachmentTest.java @@ -7,12 +7,12 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.UUID; +import java.util.concurrent.Flow; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.reactivestreams.Publisher; import io.quarkus.mailer.runtime.MutinyMailerImpl; import io.smallrye.mutiny.Multi; @@ -70,7 +70,7 @@ void testInlineAttachmentCreationFromFile() { @Test void testAttachmentCreationFromStream() { - Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) + Flow.Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) .onItem().transformToMulti(af -> af.toMulti() .onItem().transformToIterable(this::getBytes)); @@ -109,7 +109,7 @@ public Byte next() { @Test void testInlineAttachmentCreationFromStream() { - Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) + Flow.Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) .onItem().transformToMulti(af -> af.toMulti() .onItem().transformToIterable(this::getBytes)); @@ -128,7 +128,7 @@ void testInlineAttachmentCreationFromStream() { @Test void testAttachmentCreationWithDescription() { - Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) + Flow.Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) .onItem().transformToMulti(af -> af.toMulti() .onItem().transformToIterable(this::getBytes)); @@ -154,7 +154,7 @@ private String getContent(Attachment attachment) { @Test void testInlineAttachmentCreationWithDescription() { - Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) + Flow.Publisher publisher = vertx.fileSystem().open(LOREM.getAbsolutePath(), new OpenOptions().setRead(true)) .onItem().transformToMulti(af -> af.toMulti() .onItem().transformToIterable(this::getBytes)); diff --git a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java index 09f791aa587e5..50d0dbef5ff7f 100644 --- a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java +++ b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java @@ -7,11 +7,11 @@ import java.nio.charset.StandardCharsets; import java.util.*; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerWithMultipartImplTest.java b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerWithMultipartImplTest.java index 09c675c8fd9a3..a8854bb13faa8 100644 --- a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerWithMultipartImplTest.java +++ b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerWithMultipartImplTest.java @@ -12,11 +12,11 @@ import java.util.Scanner; import java.util.UUID; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/HttpBinderProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/HttpBinderProcessor.java index c812d3c97b4bb..1e48b656481b0 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/HttpBinderProcessor.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/HttpBinderProcessor.java @@ -2,8 +2,8 @@ import java.util.function.BooleanSupplier; -import javax.inject.Singleton; -import javax.servlet.DispatcherType; +import jakarta.inject.Singleton; +import jakarta.servlet.DispatcherType; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; @@ -35,7 +35,7 @@ public class HttpBinderProcessor { static final String RESTEASY_REACTIVE_CONTAINER_FILTER_CLASS_NAME = "io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderRestEasyReactiveContainerFilter"; static final String UNDERTOW_SERVLET_FILTER_CLASS_NAME = "io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderUndertowServletFilter"; - private static final String REST_CLIENT_REQUEST_FILTER = "javax.ws.rs.client.ClientRequestFilter"; + private static final String REST_CLIENT_REQUEST_FILTER = "jakarta.ws.rs.client.ClientRequestFilter"; private static final String REST_CLIENT_METRICS_FILTER = "io.quarkus.micrometer.runtime.binder.RestClientMetricsFilter"; static class HttpServerBinderEnabled implements BooleanSupplier { diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java index de444e02b53aa..30a863c73fa00 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java @@ -2,7 +2,7 @@ import java.util.function.BooleanSupplier; -import javax.interceptor.Interceptor; +import jakarta.interceptor.Interceptor; import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem; import io.quarkus.deployment.annotations.BuildStep; diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java index 6f760c6e98069..9f17fb2a1663d 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java @@ -4,10 +4,10 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java index 1f7aac98f481d..9fc9c2dc87e3b 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java @@ -51,7 +51,7 @@ public class MetricDotNames { .createSimple("org.eclipse.microprofile.metrics.Metric"); // these are needed for determining whether a class is a REST endpoint or JAX-RS provider - static final DotName JAXRS_PATH = DotName.createSimple("javax.ws.rs.Path"); + static final DotName JAXRS_PATH = DotName.createSimple("jakarta.ws.rs.Path"); static final DotName REST_CONTROLLER = DotName .createSimple("org.springframework.web.bind.annotation.RestController"); diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java index 417c36313e36b..f31d1377b8f1b 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java @@ -3,7 +3,7 @@ import java.util.function.BooleanSupplier; import java.util.function.Predicate; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java index 6dface5b65a43..8b9c1962381c7 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java @@ -1,6 +1,6 @@ package io.quarkus.micrometer.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java index 33aef40de5d4c..ed7e5f057580b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricFiltersTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Singleton; -import javax.ws.rs.Produces; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java index 3714a7f0c59a5..756268640e5d2 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java @@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java index 7a95655bedc1e..418ada578c834 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.deployment; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/GrpcMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/GrpcMetricsDisabledTest.java index 2652ada4e6adf..8f7cd1526a9b6 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/GrpcMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/GrpcMetricsDisabledTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java index 5083a70d7adcd..4acd879bc02a3 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java index d4cfd8379828d..bbeae2c8432d6 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsDisabledTest.java index d4b0f669da5a5..b8569a75f52f4 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsDisabledTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsTest.java index d23f588364fe9..15b79e3bd1873 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/RedisClientMetricsTest.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java index 02212c073dc14..3f100420c9eeb 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpApplicationRootTest.java @@ -4,13 +4,13 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Application; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java index 072334f56c4f8..d153fdb65fc5b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriTagWithHttpRootTest.java @@ -4,11 +4,11 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java index b386a2d1efc63..48cddb4fea857 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/UriWithMaxTagMeterFilterTest.java @@ -2,7 +2,7 @@ import static io.restassured.RestAssured.when; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxEventBusMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxEventBusMetricsTest.java index 1640c0c68723b..750b8db347b63 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxEventBusMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxEventBusMetricsTest.java @@ -1,6 +1,6 @@ package io.quarkus.micrometer.deployment.binder; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxHttpClientMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxHttpClientMetricsTest.java index ddfd81d8725af..1267e99dad045 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxHttpClientMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxHttpClientMetricsTest.java @@ -5,10 +5,10 @@ import java.time.Duration; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsNoClientMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsNoClientMetricsTest.java index 067926489ec30..1c0f8bfc500e9 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsNoClientMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsNoClientMetricsTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsTest.java index 40fbc28745e5a..1cf7e35c8865e 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxTcpMetricsTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxUdpMetricsTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxUdpMetricsTest.java index 91de75c4d94db..a341a23bb3ec4 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxUdpMetricsTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxUdpMetricsTest.java @@ -2,8 +2,8 @@ import static org.awaitility.Awaitility.await; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java index 8fcc4a47cbee6..f3c1b47d2bcec 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java @@ -2,7 +2,7 @@ import static io.restassured.RestAssured.when; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java index c5a3158712364..211d47664ea94 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java index f4fb610482d27..fecb7716b04b4 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java @@ -1,6 +1,6 @@ package io.quarkus.micrometer.deployment.export; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java index a3f716ade50f2..c9dd08d4e2cf9 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonAndPrometheusRegistryEnabledTest.java @@ -4,7 +4,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java index 1f58655ced5dd..9a36389f00c96 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java index 94aeba83e992a..1c8043f661a78 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/NoDefaultPrometheusTest.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java index 4803b43d78226..dfb70c42e81cd 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java index a48f8323f3d7d..be680a909710a 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.deployment.export; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.micrometer.core.instrument.Clock; import io.micrometer.prometheus.PrometheusConfig; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java index ff8dc0dbba69b..d79a1689bb1a7 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java index f1afd9f6d3654..7364893851673 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java index 0267ccd6aa938..dc3c43410c76a 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java index daa39d4f42b5a..5390b124ecc7f 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java @@ -1,6 +1,6 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java index f3604477f7770..277752e279e2f 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java @@ -1,6 +1,6 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.*; import org.junit.jupiter.api.Assertions; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java index a96cc72abd373..add85789e2b3b 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.micrometer.core.annotation.Counted; import io.smallrye.mutiny.Uni; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/HelloResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/HelloResource.java index a0796c028733b..4956eda5ca3cf 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/HelloResource.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/HelloResource.java @@ -1,10 +1,10 @@ package io.quarkus.micrometer.test; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/hello") @Singleton diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeterResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeterResource.java index 35d8f293d8701..a38e7c5ad425f 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeterResource.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeterResource.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Metrics; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java index 784ca78f3fdf0..2f92919ad4da3 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java @@ -1,6 +1,6 @@ package io.quarkus.micrometer.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.metrics.annotation.Counted; import org.eclipse.microprofile.metrics.annotation.Gauge; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/PingPongResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/PingPongResource.java index d0f1560fd5d0c..4d800fb2d5565 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/PingPongResource.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/PingPongResource.java @@ -2,12 +2,12 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/ServletEndpoint.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/ServletEndpoint.java index 41a50cb5e8f86..ab0fd361c31ec 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/ServletEndpoint.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/ServletEndpoint.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletEndpoint", urlPatterns = "/servlet/*") public class ServletEndpoint extends HttpServlet { diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java index e355359f7b193..8c209c89d33c5 100644 --- a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java +++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java @@ -6,7 +6,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.micrometer.core.annotation.Timed; import io.smallrye.mutiny.Uni; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java index 354d21235b089..c1c0799ac4fc8 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.runtime; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.micrometer.core.instrument.Clock; import io.quarkus.arc.DefaultBean; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java index ae33b75cb6754..7cdfef7a67fe6 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java @@ -1,9 +1,9 @@ package io.quarkus.micrometer.runtime; -import static javax.interceptor.Interceptor.Priority.PLATFORM_AFTER; +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_AFTER; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Metrics; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java index f8780dc87ecdc..aef5eee0f5958 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java index 985410fc6d3fc..5a86880c01fd9 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; import io.micrometer.core.annotation.Counted; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java index 97e01d6b649a3..152a36486b456 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java @@ -4,9 +4,9 @@ import java.util.concurrent.CompletionStage; import java.util.function.BiConsumer; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import io.micrometer.core.annotation.Counted; import io.micrometer.core.instrument.Counter; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java index aaab2f94a3283..feaaa3047ffb7 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java @@ -8,11 +8,11 @@ import java.util.Set; import java.util.function.Consumer; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.jboss.logging.Logger; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java index fcf3aadfbdf2d..7d6ff73b77260 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import org.jboss.logging.Logger; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMeterFilterProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMeterFilterProvider.java index 52005c4e40320..ee2c3ef86b7ab 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMeterFilterProvider.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMeterFilterProvider.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.runtime.binder; -import javax.inject.Singleton; -import javax.ws.rs.Produces; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Produces; import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.internal.OnlyOnceLoggingDenyMeterFilter; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetricsFilter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetricsFilter.java index 5a38f9a94c7f2..004aa63e2d162 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetricsFilter.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetricsFilter.java @@ -1,11 +1,11 @@ package io.quarkus.micrometer.runtime.binder; -import javax.inject.Inject; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.ext.Provider; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Metrics; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsClientInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsClientInterceptor.java index 3d7acfe1dbfb3..9e596f1050d58 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsClientInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsClientInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.micrometer.runtime.binder.grpc; -import javax.enterprise.inject.spi.Prioritized; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.Interceptor.Priority; +import jakarta.enterprise.inject.spi.Prioritized; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor.Priority; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsServerInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsServerInterceptor.java index 68137fc59e4d6..aec817f324a7f 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsServerInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/grpc/GrpcMetricsServerInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.micrometer.runtime.binder.grpc; -import javax.enterprise.inject.spi.Prioritized; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.Interceptor.Priority; +import jakarta.enterprise.inject.spi.Prioritized; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor.Priority; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java index 767b31cc7047b..5a27e30c3f68d 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.producer.Producer; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java index 70c23054d26cc..6dae8774e42c4 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.runtime.binder.kafka; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.apache.kafka.streams.KafkaStreams; import org.jboss.logging.Logger; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java index 1155e3aea6925..77a8adb331e92 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java index 9d331037fd381..0c6411101e806 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java index ee9bd89432026..d1ef92405649a 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java @@ -1,8 +1,8 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Singleton; import org.eclipse.microprofile.metrics.*; import org.eclipse.microprofile.metrics.annotation.Metric; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java index a497ff50ad612..85ca22bf81165 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java @@ -2,8 +2,8 @@ import java.util.Iterator; -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Singleton; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.binder.MeterBinder; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java index c508e6317cb84..45ec60a218aa8 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.eclipse.microprofile.metrics.*; import org.eclipse.microprofile.metrics.annotation.RegistryType; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java index 6124c087c4018..17f21bffbbe68 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.micrometer.runtime.binder.mpmetrics; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.annotation.Timed; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/redis/RedisMetricsBean.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/redis/RedisMetricsBean.java index e01edccb949a1..755eec949cc2b 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/redis/RedisMetricsBean.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/redis/RedisMetricsBean.java @@ -4,8 +4,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Typed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Typed; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderUndertowServletFilter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderUndertowServletFilter.java index 0de4166af3992..26f0cadb12765 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderUndertowServletFilter.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderUndertowServletFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.vertx.ext.web.RoutingContext; @@ -32,4 +32,4 @@ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterC metric.setTemplatePath(req.getServletPath()); } } -} \ No newline at end of file +} diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/EmptyExemplarSamplerProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/EmptyExemplarSamplerProvider.java index 1430e23aa115a..46dc7a94978d4 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/EmptyExemplarSamplerProvider.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/EmptyExemplarSamplerProvider.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import io.prometheus.client.exemplars.ExemplarSampler; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java index 012958f7d10cd..1c0d662130d98 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java @@ -1,7 +1,7 @@ package io.quarkus.micrometer.runtime.export; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.micrometer.core.instrument.Clock; import io.quarkus.micrometer.runtime.registry.json.JsonMeterRegistry; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/OpentelemetryExemplarSamplerProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/OpentelemetryExemplarSamplerProvider.java index c86d836603b90..d99131fb7831b 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/OpentelemetryExemplarSamplerProvider.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/OpentelemetryExemplarSamplerProvider.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.function.Function; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProducer.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProducer.java index 048987d7d451f..7fba83e2e3217 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProducer.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProducer.java @@ -2,10 +2,10 @@ import java.util.Optional; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; import io.micrometer.core.instrument.Clock; import io.micrometer.prometheus.PrometheusConfig; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java index 09d264afef822..b1cef90873d27 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java @@ -2,8 +2,8 @@ import java.util.Map; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.micrometer.prometheus.PrometheusConfig; import io.micrometer.prometheus.PrometheusDurationNamingConvention; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java index b73e792c8a4a8..6ef7bc62f32eb 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java @@ -1,8 +1,8 @@ package io.quarkus.micrometer.runtime.export.handlers; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java index 71409f51d82d7..1b4ab7517339c 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java @@ -1,8 +1,8 @@ package io.quarkus.micrometer.runtime.export.handlers; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java index 3d4148eda2aed..1ba39486c0b52 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java @@ -26,12 +26,12 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; -import javax.json.JsonWriter; -import javax.json.spi.JsonProvider; -import javax.json.stream.JsonGenerator; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; +import jakarta.json.spi.JsonProvider; +import jakarta.json.stream.JsonGenerator; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java index bfa847e1541b0..add4b85f039b0 100644 --- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java +++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java @@ -12,9 +12,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Singleton; import org.bson.codecs.configuration.CodecProvider; import org.bson.codecs.pojo.PropertyCodecProvider; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java index 504f581e09832..9cc7fc2d834ad 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java @@ -3,10 +3,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.literal.NamedLiteral; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.literal.NamedLiteral; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java index c48a9a7e1623e..45f9e74bb0a6b 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultMongoClientConfigTest.java @@ -5,8 +5,8 @@ import java.util.function.BiConsumer; -import javax.enterprise.inject.Any; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java index 06573e39963ea..b4f546107c2af 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java index cd0edff5a0a3f..4c9981c1d529b 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java index 4da0e47f66552..c8c1d01716668 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoLazyTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Metric; import org.eclipse.microprofile.metrics.MetricID; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java index 10792e0392a2a..dab2253817afe 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Metric; import org.eclipse.microprofile.metrics.MetricID; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java index 58fa1a9c5a2d6..cc8ba3fff7a08 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.function.Consumer; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.literal.NamedLiteral; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTracingCommandListenerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTracingCommandListenerTest.java index a846c4b7fbaee..48fe208fdce7a 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTracingCommandListenerTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTracingCommandListenerTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java index f832a61d377b4..6dae624333538 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java @@ -5,9 +5,9 @@ import java.lang.annotation.Annotation; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java index 0b02cb2e98b85..9b4cb46ed77a7 100644 --- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java +++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java @@ -6,9 +6,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/mongodb-client/runtime/pom.xml b/extensions/mongodb-client/runtime/pom.xml index d9e0efbdeb740..b76174a626e58 100644 --- a/extensions/mongodb-client/runtime/pom.xml +++ b/extensions/mongodb-client/runtime/pom.xml @@ -24,6 +24,10 @@ io.quarkus quarkus-mutiny + + io.smallrye.reactive + mutiny-zero-flow-adapters + io.quarkus quarkus-vertx diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java index 0e28fa5e33581..306e94275e71c 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Marker annotation to select mongo connection of cluster configuration diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java index 103f78e75f420..953971bcf3455 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java @@ -8,9 +8,9 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.Bean; import org.bson.Document; import org.eclipse.microprofile.health.HealthCheck; diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java index 1196ff7fc668e..acac2af661e43 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java @@ -1,6 +1,7 @@ package io.quarkus.mongodb.impl; import java.util.List; +import java.util.concurrent.Flow; import org.bson.Document; import org.bson.codecs.configuration.CodecRegistry; @@ -47,6 +48,7 @@ import io.quarkus.mongodb.reactive.ReactiveMongoCollection; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import mutiny.zero.flow.adapters.AdaptersToFlow; public class ReactiveMongoCollectionImpl implements ReactiveMongoCollection { @@ -262,11 +264,11 @@ public Multi aggregate(ClientSession clientSession, List return Wrappers.toMulti(collection.aggregate(clientSession, pipeline, clazz)); } - private AggregatePublisher apply(AggregateOptions options, AggregatePublisher publisher) { + private Flow.Publisher apply(AggregateOptions options, AggregatePublisher publisher) { if (options == null) { - return publisher; + return AdaptersToFlow.publisher(publisher); } - return options.apply(publisher); + return AdaptersToFlow.publisher(options.apply(publisher)); } @Override @@ -409,11 +411,11 @@ public Multi mapReduce(String mapFunction, String reduceFunction, MapReduceOp return Multi.createFrom().publisher(apply(options, collection.mapReduce(mapFunction, reduceFunction))); } - private MapReducePublisher apply(MapReduceOptions options, MapReducePublisher mapReduce) { + private Flow.Publisher apply(MapReduceOptions options, MapReducePublisher mapReduce) { if (options == null) { - return mapReduce; + return AdaptersToFlow.publisher(mapReduce); } - return options.apply(mapReduce); + return AdaptersToFlow.publisher(options.apply(mapReduce)); } @Override diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoDatabaseImpl.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoDatabaseImpl.java index 41249cdf9f7ba..b439c44f8cdd5 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoDatabaseImpl.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoDatabaseImpl.java @@ -1,6 +1,7 @@ package io.quarkus.mongodb.impl; import java.util.List; +import java.util.concurrent.Flow; import org.bson.Document; import org.bson.conversions.Bson; @@ -22,6 +23,7 @@ import io.quarkus.mongodb.reactive.ReactiveMongoDatabase; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import mutiny.zero.flow.adapters.AdaptersToFlow; public class ReactiveMongoDatabaseImpl implements ReactiveMongoDatabase { @@ -127,12 +129,11 @@ public Multi listCollections(Class clazz, CollectionListOptions option return Multi.createFrom().publisher(apply(options, database.listCollections(clazz))); } - private ListCollectionsPublisher apply(CollectionListOptions options, - ListCollectionsPublisher collections) { + private Flow.Publisher apply(CollectionListOptions options, ListCollectionsPublisher collections) { if (options == null) { - return collections; + return AdaptersToFlow.publisher(collections); } else { - return options.apply(collections); + return AdaptersToFlow.publisher(options.apply(collections)); } } diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/Wrappers.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/Wrappers.java index 7cb38ba3d350b..f9474f1899689 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/Wrappers.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/Wrappers.java @@ -8,6 +8,7 @@ import io.smallrye.mutiny.Uni; import io.vertx.core.Context; import io.vertx.core.Vertx; +import mutiny.zero.flow.adapters.AdaptersToFlow; class Wrappers { @@ -17,7 +18,7 @@ private Wrappers() { static Uni toUni(Publisher publisher) { Context context = Vertx.currentContext(); - Uni uni = Uni.createFrom().publisher(publisher); + Uni uni = Uni.createFrom().publisher(AdaptersToFlow.publisher(publisher)); if (context != null) { return uni.emitOn(command -> context.runOnContext(x -> command.run())); } @@ -27,15 +28,16 @@ static Uni toUni(Publisher publisher) { static Multi toMulti(Publisher publisher) { Context context = Vertx.currentContext(); if (context != null) { - return Multi.createFrom().publisher(publisher).emitOn(command -> context.runOnContext(x -> command.run())); + return Multi.createFrom().publisher(AdaptersToFlow.publisher(publisher)) + .emitOn(command -> context.runOnContext(x -> command.run())); } else { - return Multi.createFrom().publisher(publisher); + return Multi.createFrom().publisher(AdaptersToFlow.publisher(publisher)); } } static Uni> toUniOfList(Publisher publisher) { Context context = Vertx.currentContext(); - Uni> uni = Multi.createFrom().publisher(publisher) + Uni> uni = Multi.createFrom().publisher(AdaptersToFlow.publisher(publisher)) .collect().asList(); if (context != null) { diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java index c65b6e2d4b34e..72b07c884dd2c 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java @@ -1,8 +1,8 @@ package io.quarkus.mongodb.runtime; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.literal.NamedLiteral; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.util.AnnotationLiteral; public final class MongoClientBeanUtil { diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java index d5a6b29c418a1..01fa1bf4caebd 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java @@ -5,9 +5,9 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.literal.NamedLiteral; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.util.AnnotationLiteral; import com.mongodb.ConnectionString; import com.mongodb.client.MongoClient; diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java index f305be460d319..c89ff3c2d7327 100644 --- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java +++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java @@ -20,10 +20,10 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Singleton; import org.bson.codecs.configuration.CodecProvider; import org.bson.codecs.configuration.CodecRegistry; diff --git a/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java b/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java index 04571dcd56f55..c73a1b92c0c88 100644 --- a/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java +++ b/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java @@ -11,8 +11,8 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java b/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java index 70ffcff8f4772..e4798b56400d5 100644 --- a/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java +++ b/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java @@ -4,10 +4,10 @@ import java.util.Properties; -import javax.annotation.Priority; -import javax.interceptor.Interceptor; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionScoped; +import jakarta.annotation.Priority; +import jakarta.interceptor.Interceptor; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionScoped; import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean; import com.arjuna.ats.arjuna.recovery.TransactionStatusConnectionManager; diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java index a8d8608aef2a4..fb40b7b8e8ebc 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TransactionalTest.java @@ -1,13 +1,13 @@ package io.quarkus.narayana.interceptor; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TxAssertionData.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TxAssertionData.java index 2ed5fc1e621f1..689cac39a4437 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TxAssertionData.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/TxAssertionData.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class TxAssertionData { diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java index bd486052b3d21..bf551ab7aa926 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversErrorHandlingTest.java @@ -1,11 +1,11 @@ package io.quarkus.narayana.observers; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.event.TransactionPhase; -import javax.inject.Inject; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java index d02fbcb1ee1fd..dfd8208474949 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/observers/TransactionalObserversTest.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.event.TransactionPhase; -import javax.inject.Inject; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/QuarkusTransactionTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/QuarkusTransactionTest.java index b25237f4b2baf..f895d26c31fe3 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/QuarkusTransactionTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/QuarkusTransactionTest.java @@ -8,17 +8,17 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionScoped; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionScoped; import org.eclipse.microprofile.context.ThreadContext; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/TransactionRunnerTest.java b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/TransactionRunnerTest.java index 39311a6fd6901..09a3c336162af 100644 --- a/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/TransactionRunnerTest.java +++ b/extensions/narayana-jta/deployment/src/test/java/io/quarkus/narayana/quarkus/TransactionRunnerTest.java @@ -7,13 +7,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml index a15244b309cac..6a9caf4cbd5fc 100644 --- a/extensions/narayana-jta/runtime/pom.xml +++ b/extensions/narayana-jta/runtime/pom.xml @@ -51,6 +51,10 @@ io.smallrye.reactive smallrye-reactive-converter-mutiny + + io.smallrye.reactive + mutiny-zero-flow-adapters + org.graalvm.nativeimage svm diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransaction.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransaction.java index 33eadb815e644..0301cb6cd8049 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransaction.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransaction.java @@ -3,16 +3,16 @@ import java.util.concurrent.Callable; import java.util.function.Function; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transactional; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transactional; import com.arjuna.ats.jta.UserTransaction; import io.quarkus.arc.Arc; /** - * A simplified transaction interface. While broadly covering the same use cases as {@link javax.transaction.UserTransaction}, + * A simplified transaction interface. While broadly covering the same use cases as {@link jakarta.transaction.UserTransaction}, * this class is designed to be easier to use. The main features it offers over {@code UserTransaction} are: * *

    diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransactionImpl.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransactionImpl.java index 955621392e8b5..ebc8e5718dd49 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransactionImpl.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/QuarkusTransactionImpl.java @@ -2,15 +2,15 @@ import java.util.concurrent.Callable; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.jboss.logging.Logger; @@ -242,7 +242,7 @@ static void setRollbackOnly() { } } - private static javax.transaction.UserTransaction getUserTransaction() { + private static jakarta.transaction.UserTransaction getUserTransaction() { if (cachedUserTransaction == null) { return cachedUserTransaction = com.arjuna.ats.jta.UserTransaction.userTransaction(); } diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/RequestScopedTransaction.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/RequestScopedTransaction.java index 5d0ddfff4c54e..9421b0c964ea7 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/RequestScopedTransaction.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/RequestScopedTransaction.java @@ -2,15 +2,15 @@ import java.util.function.Function; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.transaction.NotSupportedException; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.jboss.logging.Logger; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java index f2172253c1358..ea456aad98cda 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java @@ -1,11 +1,11 @@ package io.quarkus.narayana.jta.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; import org.jboss.tm.JBossXATerminator; import org.jboss.tm.XAResourceRecoveryRegistry; @@ -35,7 +35,7 @@ public UserTransaction userTransaction() { @Produces @Unremovable @Singleton - public javax.transaction.TransactionManager transactionManager() { + public jakarta.transaction.TransactionManager transactionManager() { return new NotifyingTransactionManager(); } diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingTransactionManager.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingTransactionManager.java index fbe14fa03ac89..5eb6516145e55 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingTransactionManager.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingTransactionManager.java @@ -2,19 +2,19 @@ import java.io.Serializable; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Event; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Event; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionScoped; import org.jboss.logging.Logger; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingUserTransaction.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingUserTransaction.java index d38765a8d7f01..787733a12b3a1 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingUserTransaction.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NotifyingUserTransaction.java @@ -1,11 +1,11 @@ package io.quarkus.narayana.jta.runtime; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.jboss.logging.Logger; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionScopedNotifier.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionScopedNotifier.java index e851c85b905b4..55238493448c3 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionScopedNotifier.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionScopedNotifier.java @@ -2,12 +2,12 @@ import java.util.Objects; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Event; -import javax.transaction.SystemException; -import javax.transaction.TransactionScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Event; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionScoped; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java index f8fe96f29ffd3..faf5c53d5cb0d 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java @@ -9,17 +9,17 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionScoped; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionScoped; +import jakarta.transaction.TransactionSynchronizationRegistry; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple; @@ -30,7 +30,7 @@ import io.quarkus.arc.impl.LazyValue; /** - * {@link javax.enterprise.context.spi.Context} class which defines the {@link TransactionScoped} context. + * {@link jakarta.enterprise.context.spi.Context} class which defines the {@link TransactionScoped} context. */ public class TransactionContext implements InjectableContext { // marker object to be put as a key for SynchronizationRegistry to gather all beans created in the scope diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java index 6b52c3df48da7..d177e396a6041 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java @@ -4,11 +4,11 @@ import java.util.List; import java.util.ServiceLoader; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import io.quarkus.narayana.jta.runtime.test.TestTransactionCallback; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java index 5bc31cbb0cd8c..d965b3b1da999 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java @@ -9,15 +9,16 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionStage; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Flow; import java.util.function.Function; -import javax.inject.Inject; -import javax.interceptor.InvocationContext; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; @@ -33,6 +34,8 @@ import io.smallrye.mutiny.Multi; import io.smallrye.reactive.converters.ReactiveTypeConverter; import io.smallrye.reactive.converters.Registry; +import mutiny.zero.flow.adapters.AdaptersToFlow; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public abstract class TransactionalInterceptorBase implements Serializable { @@ -138,8 +141,7 @@ protected Object invokeInOurTx(InvocationContext ic, TransactionManager tm, Runn // handle asynchronously if not throwing if (!throwing && ret != null) { ReactiveTypeConverter converter = null; - if (ret instanceof CompletionStage == false - && (ret instanceof Publisher == false || ic.getMethod().getReturnType() != Publisher.class)) { + if (!isCompletionStage(ret) && !isSomePublisher(ic, ret)) { @SuppressWarnings({ "rawtypes", "unchecked" }) Optional> lookup = Registry.lookup((Class) ret.getClass()); if (lookup.isPresent()) { @@ -151,12 +153,15 @@ protected Object invokeInOurTx(InvocationContext ic, TransactionManager tm, Runn } } } - if (ret instanceof CompletionStage) { + if (isCompletionStage(ret)) { ret = handleAsync(tm, tx, ic, ret, afterEndTransaction); // convert back if (converter != null) ret = converter.fromCompletionStage((CompletionStage) ret); - } else if (ret instanceof Publisher) { + } else if (isFlowPublisher(ret)) { + // FIXME this needs to be tested + ret = handleAsync(tm, tx, ic, ret, afterEndTransaction); + } else if (isLegacyPublisher(ret)) { ret = handleAsync(tm, tx, ic, ret, afterEndTransaction); // convert back if (converter != null) @@ -173,6 +178,23 @@ protected Object invokeInOurTx(InvocationContext ic, TransactionManager tm, Runn return ret; } + private static boolean isLegacyPublisher(Object ret) { + return ret instanceof Publisher; + } + + private boolean isSomePublisher(InvocationContext ic, Object ret) { + return isLegacyPublisher(ret) || (ic.getMethod().getReturnType() == Publisher.class) + || isFlowPublisher(ret) || (ic.getMethod().getReturnType() == Flow.Publisher.class); + } + + private static boolean isFlowPublisher(Object ret) { + return ret instanceof Flow.Publisher; + } + + private boolean isCompletionStage(Object ret) { + return ret instanceof CompletionStage; + } + private int getTransactionTimeoutFromAnnotation(InvocationContext ic) { TransactionConfiguration configAnnotation = getTransactionConfiguration(ic); @@ -223,7 +245,7 @@ protected Object handleAsync(TransactionManager tm, Transaction tx, InvocationCo // Suspend the transaction to remove it from the main request thread tm.suspend(); afterEndTransaction.run(); - if (ret instanceof CompletionStage) { + if (isCompletionStage(ret)) { return ((CompletionStage) ret).handle((v, t) -> { try { doInTransaction(tm, tx, () -> { @@ -249,8 +271,15 @@ protected Object handleAsync(TransactionManager tm, Transaction tx, InvocationCo throw new CompletionException(t); return v; }); - } else if (ret instanceof Publisher) { - ret = Multi.createFrom().publisher((Publisher) ret) + } else if (isLegacyPublisher(ret) || isFlowPublisher(ret)) { + Flow.Publisher pub; + boolean isLegacyRS = !isFlowPublisher(ret); + if (isLegacyRS) { + pub = AdaptersToFlow.publisher((Publisher) ret); + } else { + pub = (Flow.Publisher) ret; + } + ret = Multi.createFrom().publisher(pub) .onFailure().invoke(t -> { try { doInTransaction(tm, tx, () -> handleExceptionNoThrow(ic, t, tx)); @@ -276,6 +305,9 @@ protected Object handleAsync(TransactionManager tm, Transaction tx, InvocationCo throw new RuntimeException(e); } }); + if (isLegacyRS) { + ret = AdaptersToReactiveStreams.publisher((Multi) ret); + } } return ret; } diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java index 59a1be7d77619..86cae40675547 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java @@ -1,14 +1,14 @@ package io.quarkus.narayana.jta.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionRequiredException; -import javax.transaction.Transactional; -import javax.transaction.TransactionalException; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionRequiredException; +import jakarta.transaction.Transactional; +import jakarta.transaction.TransactionalException; import com.arjuna.ats.jta.logging.jtaLogger; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java index adfe240cc9762..a850dccc760d2 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java @@ -1,14 +1,14 @@ package io.quarkus.narayana.jta.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.transaction.InvalidTransactionException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -import javax.transaction.TransactionalException; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.TransactionalException; import com.arjuna.ats.jta.logging.jtaLogger; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java index 83da6f1158f52..9b0371ca3f3b2 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java @@ -1,12 +1,12 @@ package io.quarkus.narayana.jta.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; /** * @author paul.robinson@redhat.com 25/05/2013 diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java index d6127af241290..0fb2dd78db9e4 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java @@ -1,12 +1,12 @@ package io.quarkus.narayana.jta.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; import io.quarkus.runtime.BlockingOperationControl; import io.quarkus.runtime.BlockingOperationNotAllowedException; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java index c27fe4ccd4171..049fef8133bd1 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java @@ -1,12 +1,12 @@ package io.quarkus.narayana.jta.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; import io.quarkus.runtime.BlockingOperationControl; import io.quarkus.runtime.BlockingOperationNotAllowedException; diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java index da4686c579cff..06ad183ef80a0 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java @@ -1,12 +1,12 @@ package io.quarkus.narayana.jta.runtime.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; /** * @author paul.robinson@redhat.com 25/05/2013 diff --git a/extensions/narayana-lra/deployment/src/main/java/io/quarkus/narayana/lra/deployment/NarayanaLRAProcessor.java b/extensions/narayana-lra/deployment/src/main/java/io/quarkus/narayana/lra/deployment/NarayanaLRAProcessor.java index 24948418b2cd2..c3df9a306825b 100644 --- a/extensions/narayana-lra/deployment/src/main/java/io/quarkus/narayana/lra/deployment/NarayanaLRAProcessor.java +++ b/extensions/narayana-lra/deployment/src/main/java/io/quarkus/narayana/lra/deployment/NarayanaLRAProcessor.java @@ -33,7 +33,7 @@ class NarayanaLRAProcessor { - private static final DotName PATH = DotName.createSimple("javax.ws.rs.Path"); + private static final DotName PATH = DotName.createSimple("jakarta.ws.rs.Path"); @BuildStep void registerFeature(BuildProducer feature, Capabilities capabilities) { diff --git a/extensions/narayana-lra/runtime/pom.xml b/extensions/narayana-lra/runtime/pom.xml index 110fe0f9ba3fb..e850b4c6e592c 100644 --- a/extensions/narayana-lra/runtime/pom.xml +++ b/extensions/narayana-lra/runtime/pom.xml @@ -42,16 +42,16 @@ lra-client - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api org.eclipse.microprofile.lra microprofile-lra-api - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation @@ -63,12 +63,12 @@ - org.jboss.narayana.rts:narayana-lra - META-INF/services/javax.ws.rs.client.ClientBuilder + org.jboss.narayana.rts:narayana-lra-jakarta + META-INF/services/jakarta.ws.rs.client.ClientBuilder - org.jboss.narayana.rts:lra-client - META-INF/services/javax.ws.rs.client.ClientBuilder + org.jboss.narayana.rts:lra-client-jakarta + META-INF/services/jakarta.ws.rs.client.ClientBuilder diff --git a/extensions/narayana-lra/runtime/src/main/java/io/quarkus/narayana/lra/runtime/NarayanaLRAProducers.java b/extensions/narayana-lra/runtime/src/main/java/io/quarkus/narayana/lra/runtime/NarayanaLRAProducers.java index d57dafc3abeb9..8be883d58437d 100644 --- a/extensions/narayana-lra/runtime/src/main/java/io/quarkus/narayana/lra/runtime/NarayanaLRAProducers.java +++ b/extensions/narayana-lra/runtime/src/main/java/io/quarkus/narayana/lra/runtime/NarayanaLRAProducers.java @@ -1,7 +1,7 @@ package io.quarkus.narayana.lra.runtime; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import io.narayana.lra.client.internal.proxy.nonjaxrs.LRAParticipantRegistry; diff --git a/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java b/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java index bb2082d8e3bcf..2f4fd1a6f3d8e 100644 --- a/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java +++ b/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.Collection; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java index 5d5f7626e2b36..069fb756162a2 100644 --- a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java +++ b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java @@ -7,7 +7,7 @@ import java.util.Random; import java.util.function.Supplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; import org.jboss.logmanager.Level; diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/BossEventLoopGroup.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/BossEventLoopGroup.java index 91b9940123d5b..22992e7a2366d 100644 --- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/BossEventLoopGroup.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/BossEventLoopGroup.java @@ -3,8 +3,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/MainEventLoopGroup.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/MainEventLoopGroup.java index 3457f2402235c..fbc266280a666 100644 --- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/MainEventLoopGroup.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/MainEventLoopGroup.java @@ -3,8 +3,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ConfigPropertyOidcClientResource.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ConfigPropertyOidcClientResource.java index 659168be30c6e..7cb2fb2aab84e 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ConfigPropertyOidcClientResource.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ConfigPropertyOidcClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client.filter; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java index 36fc4cb8af1fd..de14aff670378 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java @@ -1,12 +1,12 @@ package io.quarkus.oidc.client.filter; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/NamedOidcClientResource.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/NamedOidcClientResource.java index 5419cddb7598c..14bc445504e7c 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/NamedOidcClientResource.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/NamedOidcClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client.filter; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java index c30b039aec3be..f8f64d0ba3e38 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java @@ -2,10 +2,10 @@ import java.security.Principal; -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.Authenticated; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java index bb305bece578b..ae27a0ef6ce4b 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceConfigPropertyOidcClient.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceConfigPropertyOidcClient.java index 929f35e34e3d4..3374907ee4f11 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceConfigPropertyOidcClient.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceConfigPropertyOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java index 2d1eeda97ab58..8aeaa85434fda 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceNamedOidcClient.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceNamedOidcClient.java index efb484c0630d8..80367d8f8588e 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceNamedOidcClient.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceServiceNamedOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java index e1a3fa9708094..ff3396371393b 100644 --- a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java +++ b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java @@ -2,11 +2,11 @@ import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.Provider; import io.quarkus.oidc.client.filter.runtime.AbstractOidcClientRequestFilter; import io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfig; diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/AbstractOidcClientRequestFilter.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/AbstractOidcClientRequestFilter.java index 35de8080216d0..37657d832698c 100644 --- a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/AbstractOidcClientRequestFilter.java +++ b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/AbstractOidcClientRequestFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; diff --git a/extensions/oidc-client-reactive-filter/deployment/src/main/java/io/quarkus/oidc/client/reactive/filter/deployment/OidcClientReactiveFilterBuildStep.java b/extensions/oidc-client-reactive-filter/deployment/src/main/java/io/quarkus/oidc/client/reactive/filter/deployment/OidcClientReactiveFilterBuildStep.java index f3bebe1e72b87..5c332a2558e1b 100644 --- a/extensions/oidc-client-reactive-filter/deployment/src/main/java/io/quarkus/oidc/client/reactive/filter/deployment/OidcClientReactiveFilterBuildStep.java +++ b/extensions/oidc-client-reactive-filter/deployment/src/main/java/io/quarkus/oidc/client/reactive/filter/deployment/OidcClientReactiveFilterBuildStep.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/OidcClientResource.java b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/OidcClientResource.java index 4e36adab6ae26..559047ef13dea 100644 --- a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/OidcClientResource.java +++ b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/OidcClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client.reactive.filter; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResource.java b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResource.java index af91c7906f4bb..23ddd9ef09764 100644 --- a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResource.java +++ b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResource.java @@ -2,10 +2,10 @@ import java.security.Principal; -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.Authenticated; diff --git a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceAnnotationOidcClient.java b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceAnnotationOidcClient.java index d765aa3b7ebb2..eda0b6c579174 100644 --- a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceAnnotationOidcClient.java +++ b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceAnnotationOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.reactive.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceConfigPropertyOidcClient.java b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceConfigPropertyOidcClient.java index 98ef7a2ce58c3..ee77cac550886 100644 --- a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceConfigPropertyOidcClient.java +++ b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceConfigPropertyOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.reactive.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java index d07bcc2c0a26c..1e1a82b75042c 100644 --- a/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java +++ b/extensions/oidc-client-reactive-filter/deployment/src/test/java/io/quarkus/oidc/client/reactive/filter/ProtectedResourceServiceCustomProviderConfigPropOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client.reactive.filter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/OidcClientRequestReactiveFilter.java b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/OidcClientRequestReactiveFilter.java index ca61a0b88576e..1561f9be512cb 100644 --- a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/OidcClientRequestReactiveFilter.java +++ b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/OidcClientRequestReactiveFilter.java @@ -2,9 +2,9 @@ import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.ws.rs.Priorities; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; import io.quarkus.oidc.client.reactive.filter.runtime.AbstractOidcClientRequestReactiveFilter; import io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfig; diff --git a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/AbstractOidcClientRequestReactiveFilter.java b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/AbstractOidcClientRequestReactiveFilter.java index 641606308915f..777a10ee31142 100644 --- a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/AbstractOidcClientRequestReactiveFilter.java +++ b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/AbstractOidcClientRequestReactiveFilter.java @@ -2,8 +2,8 @@ import java.util.function.Consumer; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; diff --git a/extensions/oidc-client/deployment/pom.xml b/extensions/oidc-client/deployment/pom.xml index a457daeb34f4b..f543483f1fc23 100644 --- a/extensions/oidc-client/deployment/pom.xml +++ b/extensions/oidc-client/deployment/pom.xml @@ -66,8 +66,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation test diff --git a/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java b/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java index 40f9b529f4c4b..04ffea66bf3b8 100644 --- a/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java +++ b/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java @@ -9,8 +9,8 @@ import java.util.function.BooleanSupplier; import java.util.stream.Collectors; -import javax.enterprise.context.RequestScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java index 575ff7d0125c1..6364d03117d18 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientResource.java index 78001554762fb..7782e56abff2f 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientResource.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/NamedOidcClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client; -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.smallrye.mutiny.Uni; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java index 32d7309895149..0276e3b534b96 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; @Priority(Priorities.AUTHENTICATION) public class OidcClientRequestCustomFilter implements ClientRequestFilter { diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java index 359aab2b6716e..75c38a064d0ec 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java @@ -1,10 +1,10 @@ package io.quarkus.oidc.client; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.smallrye.mutiny.Uni; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java index 1e7432342fde8..e575a1e45fa92 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java @@ -2,11 +2,11 @@ import java.util.function.Function; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcPublicClientResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcPublicClientResource.java index 4e0d144ef23f8..99ecfe35e7918 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcPublicClientResource.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcPublicClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client; -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.smallrye.mutiny.Uni; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java index 64d109877d48e..6c469726cdd0a 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java @@ -2,10 +2,10 @@ import java.security.Principal; -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.Authenticated; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java index 12e6f9eb12f81..31efb8699f209 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.client; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/SecretProvider.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/SecretProvider.java index 2823d93b5d5bc..bc90dfcb2f4b3 100644 --- a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/SecretProvider.java +++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/SecretProvider.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import io.quarkus.credentials.CredentialsProvider; diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/NamedOidcClient.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/NamedOidcClient.java index 66d3e9db7b419..8d7438f8c2465 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/NamedOidcClient.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/NamedOidcClient.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Specification of OIDC client to be injected. diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java index f8c942e5d3070..a8eb0806ad95c 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import io.quarkus.arc.Arc; import io.quarkus.oidc.client.OidcClient; diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java index a897b4b3358ee..ada2d72c18cba 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.client.runtime; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.quarkus.oidc.client.Tokens; diff --git a/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenPropagationService.java b/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenPropagationService.java index 8a65064390978..ee7bb89991a66 100644 --- a/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenPropagationService.java +++ b/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenPropagationService.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.token.propagation.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/FrontendResource.java b/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/FrontendResource.java index 44e2f651cc43b..c0b32fbd7bfb6 100644 --- a/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/FrontendResource.java +++ b/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/FrontendResource.java @@ -1,9 +1,9 @@ package io.quarkus.oidc.token.propagation.reactive; -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 org.eclipse.microprofile.jwt.JsonWebToken; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/ProtectedResource.java b/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/ProtectedResource.java index e790aa37fe9a5..436c3adb99f02 100644 --- a/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/ProtectedResource.java +++ b/extensions/oidc-token-propagation-reactive/deployment/src/test/java/io/quarkus/oidc/token/propagation/reactive/ProtectedResource.java @@ -1,9 +1,9 @@ package io.quarkus.oidc.token.propagation.reactive; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java b/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java index 6977a08708bf2..ed7c1e4981b17 100644 --- a/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java +++ b/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/AccessTokenRequestReactiveFilter.java @@ -4,13 +4,13 @@ import java.util.Optional; import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/AccessTokenPropagationService.java b/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/AccessTokenPropagationService.java index bb19f6a55b633..7a6273c9124aa 100644 --- a/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/AccessTokenPropagationService.java +++ b/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/AccessTokenPropagationService.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.token.propagation; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/FrontendResource.java b/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/FrontendResource.java index a88077a3a89f4..1a4ee31674097 100644 --- a/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/FrontendResource.java +++ b/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/FrontendResource.java @@ -1,9 +1,9 @@ package io.quarkus.oidc.token.propagation; -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 org.eclipse.microprofile.jwt.JsonWebToken; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/ProtectedResource.java b/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/ProtectedResource.java index 369dca4ed35f8..ea3ae35bb1371 100644 --- a/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/ProtectedResource.java +++ b/extensions/oidc-token-propagation/deployment/src/test/java/io/quarkus/oidc/token/propagation/ProtectedResource.java @@ -1,9 +1,9 @@ package io.quarkus.oidc.token.propagation; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java index d7774a1034462..6f08d7a51d887 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java @@ -4,10 +4,10 @@ import java.util.Collections; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.client.ClientRequestContext; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientRequestContext; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java index 1be3a3795359c..348afd6d2afb5 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.client.ClientRequestContext; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientRequestContext; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java index 262ca3089b2d5..78026c2ef3856 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java @@ -2,15 +2,15 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml index 75c1d9329c65b..63df4b39d5ef3 100644 --- a/extensions/oidc/deployment/pom.xml +++ b/extensions/oidc/deployment/pom.xml @@ -56,8 +56,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation org.testcontainers diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java index 040f2c0ddbe4c..05c3f20801f34 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java @@ -2,7 +2,7 @@ import java.util.function.BooleanSupplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.jwt.Claim; import org.jboss.jandex.DotName; diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTenantConfigResolver.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTenantConfigResolver.java index 343cce68a8b84..9bba5cbd1c82a 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTenantConfigResolver.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTenantConfigResolver.java @@ -1,6 +1,6 @@ package io.quarkus.oidc.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.OidcRequestContext; import io.quarkus.oidc.OidcTenantConfig; diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java index 29ace56a21f85..97a487e18dfd4 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.arc.AlternativePriority; import io.quarkus.oidc.AuthorizationCodeTokens; diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java index 9c1c73e03987b..fb6a48c08750f 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java @@ -1,9 +1,9 @@ package io.quarkus.oidc.test; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecretProvider.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecretProvider.java index 42c8fb1e15428..54c04f4eb32f3 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecretProvider.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/SecretProvider.java @@ -3,8 +3,8 @@ import java.util.Collections; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import io.quarkus.credentials.CredentialsProvider; diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/UnprotectedResource.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/UnprotectedResource.java index 9a00dba696b97..1b4613f767569 100644 --- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/UnprotectedResource.java +++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/UnprotectedResource.java @@ -1,7 +1,7 @@ package io.quarkus.oidc.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/unprotected") public class UnprotectedResource { diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdToken.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdToken.java index ec2c04f9859af..d544196aedb1b 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdToken.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdToken.java @@ -8,7 +8,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ FIELD, CONSTRUCTOR, METHOD }) diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenIntrospection.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenIntrospection.java index 11a606fefc88c..137f139f06423 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenIntrospection.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenIntrospection.java @@ -1,6 +1,6 @@ package io.quarkus.oidc; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import io.quarkus.oidc.runtime.AbstractJsonObjectResponse; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java index d510c81f76082..3b8fc89fd8166 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java @@ -1,6 +1,6 @@ package io.quarkus.oidc; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import io.quarkus.oidc.runtime.AbstractJsonObjectResponse; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractJsonObjectResponse.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractJsonObjectResponse.java index 070a39b683fe5..d8e7361970eb7 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractJsonObjectResponse.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractJsonObjectResponse.java @@ -5,12 +5,12 @@ import java.util.Map; import java.util.Set; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; public class AbstractJsonObjectResponse { private String jsonString; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutHandler.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutHandler.java index 77057a83f3118..c7651a357a8c4 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutHandler.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BackChannelLogoutHandler.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.function.Consumer; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.Claims; import org.jboss.logging.Logger; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java index b092b3eaed83f..721ab284016ae 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java @@ -4,11 +4,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java index 4e51635c34d53..0b8bc172cc2bb 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java @@ -1,6 +1,6 @@ package io.quarkus.oidc.runtime; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.AuthorizationCodeTokens; import io.quarkus.oidc.OidcRequestContext; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java index 23aada5a97aa7..56b8233e3631d 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.OIDCException; import io.quarkus.oidc.OidcTenantConfig; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java index f86e88a11bdea..c3f7f3b22f1b9 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.runtime; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import io.quarkus.oidc.OIDCException; import io.quarkus.oidc.OidcConfigurationMetadata; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java index 98a8ed130b067..9eafd4a0336c1 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java @@ -7,8 +7,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.jwt.Claims; import org.jboss.logging.Logger; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java index 2bff1c56b660a..7c4c540ebeb6f 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java @@ -1,10 +1,10 @@ package io.quarkus.oidc.runtime; -import javax.annotation.Priority; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.Claims; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java index af5e1e6b9a488..1d9ca56847639 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java @@ -4,8 +4,8 @@ import java.time.Instant; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java index ee88ac297ab3f..c317fced2fc76 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java @@ -1,8 +1,8 @@ package io.quarkus.oidc.runtime; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.jboss.logging.Logger; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java index 37c7246079ed1..c4e401b83dfa7 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java @@ -4,7 +4,7 @@ import java.util.concurrent.Executor; import java.util.function.Function; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.BeanDestroyer; import io.quarkus.oidc.OidcTenantConfig; diff --git a/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java b/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java index 1f6ee8918c8f1..5c83f9dbca32b 100644 --- a/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java +++ b/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java @@ -1,8 +1,8 @@ package io.quarkus.it.openshift.client.runtime; -import javax.annotation.PreDestroy; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/instrumentation/InstrumentationProcessor.java b/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/instrumentation/InstrumentationProcessor.java index 7757673b13866..555a3e2e31d72 100644 --- a/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/instrumentation/InstrumentationProcessor.java +++ b/extensions/opentelemetry/deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/instrumentation/InstrumentationProcessor.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.deployment.tracing.instrumentation; import static io.quarkus.bootstrap.classloading.QuarkusClassLoader.isClassPresentAtRuntime; -import static javax.interceptor.Interceptor.Priority.LIBRARY_AFTER; +import static jakarta.interceptor.Interceptor.Priority.LIBRARY_AFTER; import java.util.Optional; import java.util.function.BooleanSupplier; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java index fd5c0b8c46e58..336cc92d6f37e 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledWithRootPathTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledWithRootPathTest.java index 5ee89b61dcdaa..f623d67b71fe9 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledWithRootPathTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsDisabledWithRootPathTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java index fe75191f032f4..5822aea03ca18 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEnabledTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEqualRootPath.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEqualRootPath.java index e1d78154ee789..cd0eba96a7260 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEqualRootPath.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/NonAppEndpointsEqualRootPath.java @@ -3,7 +3,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryCustomSamplerBeanTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryCustomSamplerBeanTest.java index 68e6269a42b99..4faa40dba4170 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryCustomSamplerBeanTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryCustomSamplerBeanTest.java @@ -8,9 +8,9 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevServicesDatasourcesTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevServicesDatasourcesTest.java index 65ecadb6fffe1..3d9ade017fcd4 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevServicesDatasourcesTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevServicesDatasourcesTest.java @@ -1,11 +1,12 @@ package io.quarkus.opentelemetry.deployment; -import javax.inject.Inject; import javax.sql.DataSource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; + +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java index 2f5ad1d21646d..7de4748425d34 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDisabledTest.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.deployment; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java index 00107904f049f..19d118f7f7625 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDILegacyTest.java @@ -10,10 +10,10 @@ import java.util.List; -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 org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java index addd1335ef8c3..b1cc666d2f2d2 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryHttpCDITest.java @@ -10,10 +10,10 @@ import java.util.List; -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 org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java index 7df50931b3551..6eb9098bcdcf5 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryIdGeneratorTest.java @@ -5,9 +5,9 @@ import java.lang.reflect.InvocationTargetException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java index 7bb891c94c662..59961d68ceda0 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryMDCTest.java @@ -12,10 +12,10 @@ import java.util.Objects; import java.util.stream.Collectors; -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 org.jboss.logging.MDC; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java index 471a31d280260..e9d1c4e9d575c 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryPropagatorsTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.ArrayMatching.arrayContainingInAnyOrder; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java index 979eb1503a575..9a125d705d779 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java @@ -7,9 +7,9 @@ import java.util.List; -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 org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java index 86fd2aab10d4e..51eb73e2c0045 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerBeanTest.java @@ -5,9 +5,9 @@ import java.lang.reflect.InvocationTargetException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java index d243160671bc1..10f04530ff3eb 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetrySamplerConfigTest.java @@ -4,7 +4,7 @@ import java.lang.reflect.InvocationTargetException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java index cc97d6e89340b..2cbf597bcb6dc 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/TracerDisabledTest.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.deployment; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java index a89837a29b91f..be15a684515f1 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanInterceptorTest.java @@ -9,13 +9,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanLegacyInterceptorTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanLegacyInterceptorTest.java index 08337c257210d..122d49d0b8362 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanLegacyInterceptorTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/WithSpanLegacyInterceptorTest.java @@ -9,13 +9,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/HelloResource.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/HelloResource.java index 094311fe98fd2..86e08847f94f8 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/HelloResource.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/HelloResource.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.deployment.common; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.opentelemetry.api.trace.Span; import io.opentelemetry.sdk.trace.ReadableSpan; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TestSpanExporter.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TestSpanExporter.java index 5e3629ec6353c..5f934bac68810 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TestSpanExporter.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TestSpanExporter.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.sdk.common.CompletableResultCode; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TracerRouter.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TracerRouter.java index d634f125d3bdf..688d1f3a1d976 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TracerRouter.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/common/TracerRouter.java @@ -1,8 +1,8 @@ package io.quarkus.opentelemetry.deployment.common; -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 io.opentelemetry.api.trace.Tracer; import io.quarkus.runtime.StartupEvent; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterBadEndpointTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterBadEndpointTest.java index b4434a7aaada7..47f39b975b42a 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterBadEndpointTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterBadEndpointTest.java @@ -1,6 +1,6 @@ package io.quarkus.opentelemetry.deployment.exporter.otlp; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterConfigTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterConfigTest.java index 8073c3771574a..d881b0e46d7c6 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterConfigTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterConfigTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; 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.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterDisabledTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterDisabledTest.java index c1870c72c861e..21737a5446489 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterDisabledTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/exporter/otlp/OtlpExporterDisabledTest.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.deployment.exporter.otlp; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/GrpcOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/GrpcOpenTelemetryTest.java index 0ebed9dad8ec3..bdeba99192653 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/GrpcOpenTelemetryTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/GrpcOpenTelemetryTest.java @@ -19,8 +19,8 @@ import java.time.Duration; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java index 3101dce40aff6..f50a7838ec43e 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/RestClientOpenTelemetryTest.java @@ -16,16 +16,16 @@ import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java index 9bde48df0bf6d..f5d60a2a3ff9e 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxClientOpenTelemetryTest.java @@ -17,10 +17,10 @@ import java.net.URI; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.HttpMethod; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.HttpMethod; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryForwardedTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryForwardedTest.java index 2c4399d1e2495..2e54487dd3884 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryForwardedTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryForwardedTest.java @@ -8,7 +8,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java index 8db421699a0a7..c33858a084bf1 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryTest.java @@ -30,7 +30,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryXForwardedTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryXForwardedTest.java index 16b3714a54fdf..42c5f2b0c36e9 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryXForwardedTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/instrumentation/VertxOpenTelemetryXForwardedTest.java @@ -8,7 +8,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/propagation/OpenTelemetryMpContextPropagationTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/propagation/OpenTelemetryMpContextPropagationTest.java index f556d8bfea6fd..15eab26a170ce 100644 --- a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/propagation/OpenTelemetryMpContextPropagationTest.java +++ b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/propagation/OpenTelemetryMpContextPropagationTest.java @@ -8,10 +8,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -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 org.eclipse.microprofile.context.ThreadContext; import org.junit.jupiter.api.Test; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryProducer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryProducer.java index 5069ddbb0c9ad..791f698022e22 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryProducer.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryProducer.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.runtime; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProvider.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProvider.java index 62d19a3112d13..4a48cff4071f1 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProvider.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpExporterProvider.java @@ -1,7 +1,7 @@ package io.quarkus.opentelemetry.runtime.exporter.otlp; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.quarkus.arc.DefaultBean; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpRecorder.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpRecorder.java index 26d53fcefa562..6f775ca1f7097 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpRecorder.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/exporter/otlp/OtlpRecorder.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.CDI; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java index 1066280c6baf4..fc32e063dc3d3 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerRecorder.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.sdk.resources.Resource; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerUtil.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerUtil.java index 9c5709d8b5306..7d781fdbde16b 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerUtil.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/TracerUtil.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java index c370546986cd9..fe4305f156292 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/TracerProducer.java @@ -2,9 +2,9 @@ import static io.quarkus.opentelemetry.runtime.config.OpenTelemetryConfig.INSTRUMENTATION_NAME; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.baggage.Baggage; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java index 2b016071a58a5..dcc0123797675 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/cdi/WithSpanInterceptor.java @@ -7,9 +7,9 @@ import java.lang.reflect.Parameter; import java.util.Set; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.SpanKind; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingClientInterceptor.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingClientInterceptor.java index b5c07e3dd08dd..1c8a7b5cf32fd 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingClientInterceptor.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingClientInterceptor.java @@ -2,7 +2,7 @@ import static io.quarkus.opentelemetry.runtime.config.OpenTelemetryConfig.INSTRUMENTATION_NAME; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java index 550b6d650d158..584589a31cc49 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java @@ -6,7 +6,7 @@ import java.net.SocketAddress; import java.util.Collections; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.grpc.ForwardingServerCall.SimpleForwardingServerCall; import io.grpc.ForwardingServerCallListener.SimpleForwardingServerCallListener; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingDecorator.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingDecorator.java index 35e2956d3e82c..cba4e77aba404 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingDecorator.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/reactivemessaging/ReactiveMessagingTracingDecorator.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java index 04a1ee35efc33..c470f5a5d9cf0 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/restclient/OpenTelemetryClientFilter.java @@ -7,13 +7,13 @@ import java.net.URI; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.Provider; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryClassicServerFilter.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryClassicServerFilter.java index 1f09c75ff9533..1b57e66e17345 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryClassicServerFilter.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryClassicServerFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import io.opentelemetry.api.trace.Span; import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryReactiveServerFilter.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryReactiveServerFilter.java index e60747a321edc..e21cd90ded953 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryReactiveServerFilter.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/resteasy/OpenTelemetryReactiveServerFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/HttpInstrumenterVertxTracer.java b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/HttpInstrumenterVertxTracer.java index f06ded3420f07..0b4c65c1cba13 100644 --- a/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/HttpInstrumenterVertxTracer.java +++ b/extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/vertx/HttpInstrumenterVertxTracer.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.function.BiConsumer; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import io.netty.handler.codec.http.HttpResponseStatus; import io.opentelemetry.api.OpenTelemetry; diff --git a/extensions/panache/hibernate-orm-panache-common/deployment/src/main/java/io/quarkus/hibernate/orm/panache/common/deployment/PanacheJpaCommonResourceProcessor.java b/extensions/panache/hibernate-orm-panache-common/deployment/src/main/java/io/quarkus/hibernate/orm/panache/common/deployment/PanacheJpaCommonResourceProcessor.java index e32cefc3f6ea9..9e554993ab961 100644 --- a/extensions/panache/hibernate-orm-panache-common/deployment/src/main/java/io/quarkus/hibernate/orm/panache/common/deployment/PanacheJpaCommonResourceProcessor.java +++ b/extensions/panache/hibernate-orm-panache-common/deployment/src/main/java/io/quarkus/hibernate/orm/panache/common/deployment/PanacheJpaCommonResourceProcessor.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Set; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java index 0cfcf4be76508..f2abf844e335b 100644 --- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java +++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java @@ -9,11 +9,11 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.hibernate.Session; diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java index 1f4dbad0e363f..aa5ea471987ee 100644 --- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java +++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java @@ -10,10 +10,10 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.NonUniqueResultException; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.Query; import org.hibernate.Filter; import org.hibernate.Session; diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java index d807d90372880..63bc12500bb7c 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java @@ -15,8 +15,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt index c6842dae37244..19672d65310b9 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.Id +import jakarta.persistence.Id class DuplicateIdEntity : PanacheEntity() { @Id diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt index 14a5e306ae467..a3f88d987aaad 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/MyEntity.kt @@ -2,7 +2,7 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class MyEntity : PanacheEntity() { diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt index b292b767d9b9a..38bd7a486eaea 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/config/ConfigEnabledFalseTest.kt @@ -7,7 +7,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.persistence.EntityManagerFactory +import jakarta.persistence.EntityManagerFactory class ConfigEnabledFalseTest { companion object { diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt index aa751ceb6b010..69109a758ba44 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt @@ -2,12 +2,12 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first.FirstEntity import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second.SecondEntity -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.MediaType +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.MediaType @Path("/persistence-unit") class PanacheTestResource { diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt index 729071a903a50..11b9bf1ee4921 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class FirstEntity : PanacheEntity() { diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt index 85e2ec600b2bd..615a70dbc1a38 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt @@ -2,7 +2,7 @@ package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.seco import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class SecondEntity : PanacheEntity() { diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml index 3b30214d930ac..a9fe8b3c162ba 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml @@ -76,7 +76,7 @@ org.hibernate - hibernate-jpamodelgen + hibernate-jpamodelgen-jakarta provided diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt index e5a497036fe4b..2c088c7f24411 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt @@ -5,9 +5,9 @@ import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.Compa import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort import io.quarkus.panache.common.impl.GenerateBridge +import jakarta.persistence.EntityManager +import jakarta.persistence.LockModeType import java.util.stream.Stream -import javax.persistence.EntityManager -import javax.persistence.LockModeType /** * Defines methods to be used via the companion objects of entities. diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntity.kt index 2912a34b6d58a..630f5bde6360a 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntity.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntity.kt @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.panache.kotlin -import javax.persistence.GeneratedValue -import javax.persistence.Id -import javax.persistence.MappedSuperclass +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id +import jakarta.persistence.MappedSuperclass /** * Represents an entity with a generated ID field [id] of type [Long]. If your diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt index 923c89783634c..9f08347d9c00b 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt @@ -2,7 +2,7 @@ package io.quarkus.hibernate.orm.panache.kotlin import com.fasterxml.jackson.annotation.JsonIgnore import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.Companion.INSTANCE -import javax.json.bind.annotation.JsonbTransient +import jakarta.json.bind.annotation.JsonbTransient /** * Represents an entity. If your Hibernate entities extend this class they gain auto-generated accessors diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt index 0939f4339048b..7df1e8be32c74 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt @@ -2,12 +2,12 @@ package io.quarkus.hibernate.orm.panache.kotlin import io.quarkus.panache.common.Page import io.quarkus.panache.common.Parameters +import jakarta.persistence.LockModeType +import jakarta.persistence.NonUniqueResultException import org.hibernate.Session import org.hibernate.annotations.Filter import org.hibernate.annotations.FilterDef import java.util.stream.Stream -import javax.persistence.LockModeType -import javax.persistence.NonUniqueResultException /** * Interface representing an entity query, which abstracts the use of paging, getting the number of results, and diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt index 04ec4d74bc33c..6a392252f418e 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt @@ -5,9 +5,9 @@ import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.Compa import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort import io.quarkus.panache.common.impl.GenerateBridge +import jakarta.persistence.EntityManager +import jakarta.persistence.LockModeType import java.util.stream.Stream -import javax.persistence.EntityManager -import javax.persistence.LockModeType /** * Represents a Repository for a specific type of entity `Entity`, with an ID type of `Id`. Implementing this interface diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.kt index 5b88cd4eeb753..b42f67309336e 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.kt @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.panache.kotlin.runtime import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations -import javax.persistence.EntityManager +import jakarta.persistence.EntityManager class KotlinJpaOperations : AbstractJpaOperations>() { override fun createPanacheQuery(em: EntityManager, query: String, orderBy: String?, paramsArrayOrMap: Any?) = diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.kt index 778467b361e8e..98753cd746cdc 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.kt @@ -4,9 +4,9 @@ import io.quarkus.hibernate.orm.panache.common.runtime.CommonPanacheQueryImpl import io.quarkus.hibernate.orm.panache.kotlin.PanacheQuery import io.quarkus.panache.common.Page import io.quarkus.panache.common.Parameters +import jakarta.persistence.EntityManager +import jakarta.persistence.LockModeType import java.util.stream.Stream -import javax.persistence.EntityManager -import javax.persistence.LockModeType class PanacheQueryImpl : PanacheQuery { private var delegate: CommonPanacheQueryImpl diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java index 0f2409bb954ec..08381fdc3eaa5 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java @@ -13,8 +13,8 @@ import java.util.TreeMap; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.Id; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java index 51323dd11dbb9..65267554e0e93 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -import javax.persistence.Id; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java index d1bc52ffca989..e16d41e8da322 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -import javax.persistence.Id; +import jakarta.persistence.Id; public class DuplicateIdWithParentEntity extends DuplicateIdParentEntity { @Id diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceResource.java index 062ae4d671ecb..adb591922a2fe 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceResource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/InheritanceResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -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.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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBEntity.java index d1df28297e696..3e1a045342edd 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBEntity.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -import javax.persistence.Entity; -import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBTestResource.java index 6fb84c7c1bb0f..f1fc8c0fffc76 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBTestResource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JAXBTestResource.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -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.junit.jupiter.api.Assertions; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java index ae831eb3c6f63..bb44175185b14 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java index 10b054bd289fd..f4e2733196219 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java index 8c71dd76d1199..4564036c42316 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -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.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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java index a5ee66fa499bb..6893b6eed15f8 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.panache.deployment.test; -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.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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java index 51cca2fd6176f..9015d163d57d8 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java @@ -9,12 +9,12 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlTransient; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java index 480ed807ae461..5041af0e01ef9 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java @@ -2,7 +2,7 @@ import io.quarkus.hibernate.orm.panache.PanacheEntity; -//import javax.persistence.Entity; +//import jakarta.persistence.Entity; //@Entity public class UnAnnotatedEntity extends PanacheEntity { diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.java index 6e41d211ad8b1..d4da54c868941 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.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("unannotatedEntity") public class UnAnnotatedEntityResource { diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/config/ConfigEnabledFalseTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/config/ConfigEnabledFalseTest.java index 300740555e537..1d01762b21a38 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/config/ConfigEnabledFalseTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/config/ConfigEnabledFalseTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/ChildEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/ChildEntity.java index a1f6797d3c488..dce07fb9c8c91 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/ChildEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/ChildEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ChildEntity extends MappedParent { diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/MappedParent.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/MappedParent.java index 156c5206bb1f6..3283b055435a3 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/MappedParent.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/inheritance/MappedParent.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test.inheritance; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java index b2d86aa1b975e..8cacbb4cd8484 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java index d9af0e9c9ab2a..af5ffb67419e2 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu; -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.MediaType; +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.MediaType; import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity; import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second.SecondEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java index 355ef65eb46f3..79b6d5be24771 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java index 11cd178f54220..d3c6a0c37cff7 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java @@ -2,11 +2,11 @@ import java.io.Serializable; -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 Issue11842Entity implements Serializable { diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java index 1d5718c9c85c4..a5536ebc76f81 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java index bad3765e95066..79ed336fe3bfe 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java @@ -1,11 +1,11 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository; -import javax.inject.Inject; -import javax.transaction.Transactional; -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.transaction.Transactional; +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.annotations.jaxrs.PathParam; diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java index 41d2ade66a0fa..29c88d0f9afc7 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-orm-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-panache/runtime/pom.xml index 79101f6144cc6..4a708c4966046 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/pom.xml +++ b/extensions/panache/hibernate-orm-panache/runtime/pom.xml @@ -51,7 +51,7 @@ org.hibernate - hibernate-jpamodelgen + hibernate-jpamodelgen-jakarta provided @@ -68,14 +68,14 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation provided diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java index 395da1cfadf53..5d93af879699d 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java @@ -2,8 +2,8 @@ import java.util.Map; -import javax.persistence.EntityManager; -import javax.transaction.TransactionManager; +import jakarta.persistence.EntityManager; +import jakarta.transaction.TransactionManager; import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations; import io.quarkus.hibernate.orm.panache.runtime.JpaOperations; diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntity.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntity.java index 78e42e18d1059..f7e986154c827 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntity.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.panache; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; /** *

    diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java index db135950c91cb..e3d297812f9a2 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java @@ -7,10 +7,10 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.json.bind.annotation.JsonbTransient; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Transient; +import jakarta.json.bind.annotation.JsonbTransient; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheQuery.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheQuery.java index a9979a8f3e05a..d7a07e580dd96 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheQuery.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheQuery.java @@ -5,9 +5,9 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; import org.hibernate.Session; import org.hibernate.annotations.FilterDef; diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java index 2f4ecf301b23c..7a69d6604d325 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java @@ -8,8 +8,8 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import io.quarkus.panache.common.Parameters; import io.quarkus.panache.common.Sort; diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java index f09ba6149feda..f136bf2ec6cf4 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java @@ -8,11 +8,11 @@ import java.util.Map; import java.util.Set; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.Metamodel; import org.hibernate.engine.spi.CascadeStyle; import org.hibernate.engine.spi.CascadingActions; @@ -70,8 +70,8 @@ public static long deleteAllWithCascade(AbstractJpaOperations jpaOperations, /** * Detects if cascading delete is needed. The delete-cascading is needed when associations with cascade delete enabled - * {@link javax.persistence.OneToMany#cascade()} and also on entities containing a collection of elements - * {@link javax.persistence.ElementCollection} + * {@link jakarta.persistence.OneToMany#cascade()} and also on entities containing a collection of elements + * {@link jakarta.persistence.ElementCollection} * * @param entityClass * @return true if cascading delete is needed. False otherwise diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/CustomCountPanacheQuery.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/CustomCountPanacheQuery.java index 07a68ed4a617e..479a2f5d50501 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/CustomCountPanacheQuery.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/CustomCountPanacheQuery.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.panache.runtime; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.query.internal.QueryImpl; diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java index 783385a053e96..380f66dd0f1f1 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.stream.Stream; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations; diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheQueryImpl.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheQueryImpl.java index f2d7d8b129d6b..00bd2bf6f3ba1 100644 --- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheQueryImpl.java +++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheQueryImpl.java @@ -6,8 +6,8 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import io.quarkus.hibernate.orm.panache.PanacheQuery; import io.quarkus.hibernate.orm.panache.common.runtime.CommonPanacheQueryImpl; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java index cf070760c5e3f..9e6920c5ef3b8 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment; -import javax.persistence.Id; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.jboss.jandex.ClassInfo; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java index ef1e2375ba6e8..e4bf84b53aaf7 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import io.quarkus.gizmo.BytecodeCreator; import io.quarkus.gizmo.ResultHandle; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java index 188e436f4e775..135872bc97aec 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java @@ -7,7 +7,7 @@ import java.lang.reflect.Modifier; import java.util.List; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java index d8ff8b7bf81f3..66b8ef916ecd7 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java index c7dbaaa8835ea..055ce63d6b4e7 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.Map; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.transaction.Transactional; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.transaction.Transactional; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.FieldInfo; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java index ebc00cdf55fe5..e50a90dd79848 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java @@ -11,7 +11,7 @@ import java.util.LinkedList; import java.util.List; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; import org.junit.jupiter.api.Test; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java index f30a5456bf391..4112ee26eef7e 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java index e70756b8e8900..6d78bc99ac843 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java index 138b10db9b5f3..24206ade0306e 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java @@ -3,11 +3,11 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java index b269f7deaf64a..714b6c1c88c59 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java @@ -3,9 +3,9 @@ import java.util.Collections; import java.util.List; -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.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; import io.quarkus.rest.data.panache.ResourceProperties; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/EmptyListItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/EmptyListItem.java index 705ccf26e555a..292bf4c615096 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/EmptyListItem.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/EmptyListItem.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/InjectionResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/InjectionResource.java index 19f2e6e1e90fb..1bf79d171d6a6 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/InjectionResource.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/InjectionResource.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 io.quarkus.panache.common.Page; import io.quarkus.panache.common.Sort; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java index 1b69b84afb9d2..41ada2bfde65b 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "Item.containsInName", query = "from Item where name like CONCAT('%', CONCAT(:name, '%'))") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java index 23c2eddaa2eb8..43f3cb48cd06b 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java @@ -7,7 +7,7 @@ import static io.quarkus.hibernate.orm.rest.data.panache.deployment.entity.PanacheEntityResourceMethodListenerTest.ON_BEFORE_SAVE_COUNTER; import static io.quarkus.hibernate.orm.rest.data.panache.deployment.entity.PanacheEntityResourceMethodListenerTest.ON_BEFORE_UPDATE_COUNTER; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.rest.data.panache.RestDataResourceMethodListener; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractEntity.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractEntity.java index 12164b9b77b98..78b3eb84bbdec 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractEntity.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity { diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractItem.java index 9cc7828fa24d4..8d1df1cde450c 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractItem.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/AbstractItem.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Collection.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Collection.java index 0722edf007579..6a1ed46ca7c5e 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Collection.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Collection.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; @Entity public class Collection { diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsRepository.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsRepository.java index 2423c9b6ce78c..a969cd016eff3 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsRepository.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsResource.java index 323e85f727b4b..daf02a94541d7 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsResource.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/CollectionsResource.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -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.MethodProperties; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItem.java index b233ea1166bec..549334ff172e0 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItem.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItem.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EmptyListItem extends AbstractItem { diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItemsRepository.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItemsRepository.java index 134faddb349e7..8e55951ef8b63 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItemsRepository.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/EmptyListItemsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Item.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Item.java index e448245ee8509..de2721737d4b3 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Item.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/Item.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Item extends AbstractItem { diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/ItemsRepository.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/ItemsRepository.java index 6367d59d99d30..ac865d0fb9886 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/ItemsRepository.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/openapi/ItemsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.openapi; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java index 8a74a60acf166..c6cdce79ef66b 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java index 94848097e02df..1b8500cc8d6f2 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java index 57399f50dca42..3875dcf5aa605 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java @@ -3,11 +3,11 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsRepository.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsRepository.java index 5978ae8aa7900..fe8a55f3644d7 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsRepository.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItem.java index 3ceb8369263f6..5452a8b839e7c 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItem.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItem.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItemsRepository.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItemsRepository.java index 5434365e0574f..f821307daaa0c 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItemsRepository.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/EmptyListItemsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java index da0e9cb0d59eb..e9dde0f05908d 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "Item.containsInName", query = "from Item where name like CONCAT('%', CONCAT(:name, '%'))") diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsRepository.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsRepository.java index 3770b6ea9ea2c..be69f77a87570 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsRepository.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java b/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java index d15a8d358ecfc..2483faa98282c 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.orm.rest.data.panache.runtime; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jboss.logging.Logger; @@ -21,7 +21,7 @@ private Response throwableToResponse(Throwable throwable, String message) { return Response.status(Response.Status.CONFLICT.getStatusCode(), message).build(); } - if (throwable instanceof javax.validation.ConstraintViolationException) { + if (throwable instanceof jakarta.validation.ConstraintViolationException) { return Response.status(Response.Status.BAD_REQUEST.getStatusCode(), message).build(); } diff --git a/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/jta/TransactionalUpdateExecutor.java b/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/jta/TransactionalUpdateExecutor.java index b96e98ce4fc18..a36c97325e7f5 100644 --- a/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/jta/TransactionalUpdateExecutor.java +++ b/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/jta/TransactionalUpdateExecutor.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.inject.Singleton; -import javax.transaction.Transactional; +import jakarta.inject.Singleton; +import jakarta.transaction.Transactional; import io.quarkus.rest.data.panache.runtime.UpdateExecutor; diff --git a/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java index 338213dcf98a6..cd9f5a983c1b3 100644 --- a/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java +++ b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Priority; -import javax.interceptor.Interceptor; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.annotation.Priority; +import jakarta.interceptor.Interceptor; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java index feedef2dc2b1d..5fdf02d6d39de 100644 --- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java +++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java @@ -13,8 +13,8 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Stream; -import javax.enterprise.inject.spi.Bean; -import javax.persistence.LockModeType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.persistence.LockModeType; import org.hibernate.internal.util.LockModeConverter; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java index 96896088c52b0..a0b92d30bacb1 100644 --- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java +++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java @@ -9,7 +9,7 @@ import java.util.concurrent.CompletionException; import java.util.function.Supplier; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.Filter; import org.hibernate.internal.util.LockModeConverter; diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactional.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactional.java index 42b44f0901912..83afdbcd48230 100644 --- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactional.java +++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactional.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptor.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptor.java index 5272fc6cfd01d..74e11668f926f 100644 --- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptor.java +++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.reactive.panache.common.runtime; -import javax.annotation.Priority; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.Interceptor; @Interceptor @ReactiveTransactional diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java index 47b92817d0911..3e51fcc1aad5f 100644 --- a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java +++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/ReactiveTransactionalInterceptorBase.java @@ -6,8 +6,8 @@ import java.time.Duration; import java.util.function.Function; -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.InvocationContext; import org.hibernate.reactive.mutiny.Mutiny.Transaction; diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java index 4a5ae64951609..b799791560c67 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java +++ b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Id; +import jakarta.persistence.Id; import org.hibernate.reactive.mutiny.Mutiny; import org.jboss.jandex.AnnotationInstance; diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt index 07f3c1ee26b73..e22eb58a2b786 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/deployment/test/MyEntity.kt @@ -2,7 +2,7 @@ package io.quarkus.hibernate.reactive.panache.kotlin.deployment.test import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class MyEntity : PanacheEntity() { diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml index 0e753a91852c4..c1b27a5186537 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/pom.xml @@ -71,7 +71,7 @@ org.hibernate - hibernate-jpamodelgen + hibernate-jpamodelgen-jakarta provided @@ -97,14 +97,14 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation provided diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheCompanion.kt b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheCompanion.kt index b1dc5be70416c..6695a175fd064 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheCompanion.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheCompanion.kt @@ -8,9 +8,9 @@ import io.quarkus.panache.common.impl.GenerateBridge import io.smallrye.common.annotation.CheckReturnValue import io.smallrye.mutiny.Multi import io.smallrye.mutiny.Uni +import jakarta.persistence.LockModeType import org.hibernate.reactive.mutiny.Mutiny import java.util.stream.Stream -import javax.persistence.LockModeType /** * Defines methods to be used via the companion objects of entities. diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntity.kt b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntity.kt index 8ae0437c6a8c1..ba88bc0bc2511 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntity.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntity.kt @@ -1,8 +1,8 @@ package io.quarkus.hibernate.reactive.panache.kotlin -import javax.persistence.GeneratedValue -import javax.persistence.Id -import javax.persistence.MappedSuperclass +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id +import jakarta.persistence.MappedSuperclass @MappedSuperclass open class PanacheEntity : PanacheEntityBase { diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntityBase.kt b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntityBase.kt index 589897d271815..1801dcb4c3320 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntityBase.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheEntityBase.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore import io.quarkus.hibernate.reactive.panache.kotlin.runtime.KotlinJpaOperations.Companion.INSTANCE import io.smallrye.common.annotation.CheckReturnValue import io.smallrye.mutiny.Uni -import javax.json.bind.annotation.JsonbTransient +import jakarta.json.bind.annotation.JsonbTransient interface PanacheEntityBase { /** diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheQuery.kt b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheQuery.kt index aa45ea28955a9..9db3027c9394d 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheQuery.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheQuery.kt @@ -5,11 +5,11 @@ import io.quarkus.panache.common.Parameters import io.smallrye.common.annotation.CheckReturnValue import io.smallrye.mutiny.Multi import io.smallrye.mutiny.Uni +import jakarta.persistence.LockModeType +import jakarta.persistence.NonUniqueResultException import org.hibernate.Session import org.hibernate.annotations.Filter import org.hibernate.annotations.FilterDef -import javax.persistence.LockModeType -import javax.persistence.NonUniqueResultException interface PanacheQuery { diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheRepositoryBase.kt b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheRepositoryBase.kt index d524399540633..3937b2b79a99b 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheRepositoryBase.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/PanacheRepositoryBase.kt @@ -8,9 +8,9 @@ import io.quarkus.panache.common.impl.GenerateBridge import io.smallrye.common.annotation.CheckReturnValue import io.smallrye.mutiny.Multi import io.smallrye.mutiny.Uni +import jakarta.persistence.LockModeType import org.hibernate.reactive.mutiny.Mutiny import java.util.stream.Stream -import javax.persistence.LockModeType /** * Represents a Repository for a specific type of entity `Entity`, with an ID type diff --git a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/runtime/PanacheQueryImpl.kt b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/runtime/PanacheQueryImpl.kt index b6786528c226e..1d3ea5269d02c 100644 --- a/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/runtime/PanacheQueryImpl.kt +++ b/extensions/panache/hibernate-reactive-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/reactive/panache/kotlin/runtime/PanacheQueryImpl.kt @@ -6,8 +6,8 @@ import io.quarkus.panache.common.Page import io.quarkus.panache.common.Parameters import io.smallrye.mutiny.Multi import io.smallrye.mutiny.Uni +import jakarta.persistence.LockModeType import org.hibernate.reactive.mutiny.Mutiny -import javax.persistence.LockModeType class PanacheQueryImpl : PanacheQuery { private var delegate: CommonPanacheQueryImpl diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java index 7769dcb138e6a..635fde1265f35 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.reactive.mutiny.Mutiny; import org.jboss.jandex.AnnotationInstance; diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java index 95f29dc187c17..56b704531bb18 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.panache.test; -import javax.persistence.Id; +import jakarta.persistence.Id; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java index 87922c53fea5b..5da2b285fb88e 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.panache.test; -import javax.persistence.Id; +import jakarta.persistence.Id; public class DuplicateIdWithParentEntity extends DuplicateIdParentEntity { @Id diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java index 3f6705e99befe..b2ce1984a0ed9 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.panache.test; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java index 08e3b8712d072..4d7bfafb816c2 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.panache.test; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java index 0e5201f691ed3..da2a06a821a05 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.reactive.panache.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java index bcb6dce00b120..fecc2b9b54547 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java @@ -1,12 +1,12 @@ package io.quarkus.hibernate.reactive.panache.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml index f3021f1329f25..ca85b7e664c57 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml +++ b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml @@ -55,7 +55,7 @@ org.hibernate - hibernate-jpamodelgen + hibernate-jpamodelgen-jakarta provided @@ -76,14 +76,14 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation provided diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java index 2f19d06fe8ffe..ebe56735c353a 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java +++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java @@ -1,9 +1,9 @@ package io.quarkus.hibernate.reactive.panache; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; /** *

    diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java index d083dd4d4d1c2..54ae5299fd740 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java +++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java @@ -6,9 +6,9 @@ import java.util.Map; import java.util.stream.Stream; -import javax.json.bind.annotation.JsonbTransient; -import javax.persistence.LockModeType; -import javax.persistence.Transient; +import jakarta.json.bind.annotation.JsonbTransient; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Transient; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java index bd5d91bc89525..515e26fcd3675 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java +++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java @@ -4,9 +4,9 @@ import java.util.Map; import java.util.stream.Stream; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; import org.hibernate.Session; import org.hibernate.annotations.FilterDef; diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java index e2a36aa1e1740..46a696fcbcb31 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java +++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java index 17a4d27d5a40e..8f69bbb1a2f7f 100644 --- a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java +++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/EntityClassHelper.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/EntityClassHelper.java index 95ad345c2d2f6..2f48f53b0bf8e 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/EntityClassHelper.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/EntityClassHelper.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment; -import javax.persistence.Id; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.jboss.jandex.ClassInfo; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/ResourceImplementor.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/ResourceImplementor.java index 157a570140815..d55a8a35d0495 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/ResourceImplementor.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/ResourceImplementor.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.FieldInfo; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/AbstractGetMethodTest.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/AbstractGetMethodTest.java index ca6ebebabacd4..77671de648648 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/AbstractGetMethodTest.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/AbstractGetMethodTest.java @@ -11,7 +11,7 @@ import java.util.LinkedList; import java.util.List; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; import org.junit.jupiter.api.Test; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractEntity.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractEntity.java index 7d2d4413a04ca..170759a1ded24 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractEntity.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractItem.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractItem.java index c7554c4244db4..36aa8928bd199 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractItem.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/AbstractItem.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity; -import javax.json.bind.annotation.JsonbTransient; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.json.bind.annotation.JsonbTransient; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractItem extends AbstractEntity { diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Collection.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Collection.java index 12b55a425502d..9cb859f2d92eb 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Collection.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Collection.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/EmptyListItem.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/EmptyListItem.java index ebf55c43b771c..61c40c144dd02 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/EmptyListItem.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/EmptyListItem.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EmptyListItem extends AbstractItem { diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/InjectionResource.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/InjectionResource.java index 19596484519c3..ef961bbd2922f 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/InjectionResource.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/InjectionResource.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 io.quarkus.panache.common.Page; import io.quarkus.panache.common.Sort; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Item.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Item.java index 1dafc18413e99..3646f8e0342bb 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Item.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/Item.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "Item.containsInName", query = "from Item where name like CONCAT('%', CONCAT(:name, '%'))") diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java index 52e71b264e8aa..7c2668921af43 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/entity/ItemRestDataResourceMethodListener.java @@ -7,7 +7,7 @@ import static io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity.PanacheEntityResourceMethodListenerTest.ON_BEFORE_SAVE_COUNTER; import static io.quarkus.hibernate.reactive.rest.data.panache.deployment.entity.PanacheEntityResourceMethodListenerTest.ON_BEFORE_UPDATE_COUNTER; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.rest.data.panache.RestDataResourceMethodListener; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractEntity.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractEntity.java index 3d6e824b5fb52..f08aeaf0e598e 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractEntity.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractEntity.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractItem.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractItem.java index 89512df4abd4e..db4512f19f3ee 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractItem.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/AbstractItem.java @@ -1,8 +1,8 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.json.bind.annotation.JsonbTransient; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.json.bind.annotation.JsonbTransient; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractItem extends AbstractEntity { diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Collection.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Collection.java index c5c8f0c674af8..966c6bedf2419 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Collection.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Collection.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/CollectionsRepository.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/CollectionsRepository.java index c76d66d00cc77..c17eb5d64db25 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/CollectionsRepository.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/CollectionsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItem.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItem.java index ebb225f70e947..1e1622f8692ed 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItem.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItem.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EmptyListItem extends AbstractItem { diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItemsRepository.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItemsRepository.java index a3ccfcf60a241..36c3900f3e78a 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItemsRepository.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/EmptyListItemsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Item.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Item.java index c380ccc0406e1..9a236d260ee92 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Item.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/Item.java @@ -1,7 +1,7 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "Item.containsInName", query = "from Item where name like CONCAT('%', CONCAT(:name, '%'))") diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/ItemsRepository.java b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/ItemsRepository.java index 7f87a5a8aaf85..29c2de9375e34 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/ItemsRepository.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/rest/data/panache/deployment/repository/ItemsRepository.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.deployment.repository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; diff --git a/extensions/panache/hibernate-reactive-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java b/extensions/panache/hibernate-reactive-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java index bfc2dbe61b2db..24b983da04c29 100644 --- a/extensions/panache/hibernate-reactive-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java +++ b/extensions/panache/hibernate-reactive-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java @@ -1,6 +1,6 @@ package io.quarkus.hibernate.reactive.rest.data.panache.runtime; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hibernate.HibernateException; import org.jboss.logging.Logger; @@ -31,7 +31,7 @@ private RestResponse throwableToResponse(Throwable throwable, String m return RestResponse.status(Response.Status.CONFLICT.getStatusCode(), message); } - if (throwable instanceof javax.validation.ConstraintViolationException) { + if (throwable instanceof jakarta.validation.ConstraintViolationException) { return RestResponse.status(Response.Status.BAD_REQUEST.getStatusCode(), message); } diff --git a/extensions/panache/mongodb-panache-common/deployment/src/test/java/io/quarkus/mongodb/panache/common/MongoDatabaseResolverTest.java b/extensions/panache/mongodb-panache-common/deployment/src/test/java/io/quarkus/mongodb/panache/common/MongoDatabaseResolverTest.java index a4cda3df64902..ef3f4c2892a0a 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/test/java/io/quarkus/mongodb/panache/common/MongoDatabaseResolverTest.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/test/java/io/quarkus/mongodb/panache/common/MongoDatabaseResolverTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.bson.Document; import org.bson.codecs.pojo.annotations.BsonId; diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdDeserializer.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdDeserializer.java index dac98b47fed20..da5f09cd034f8 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdDeserializer.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdDeserializer.java @@ -2,9 +2,9 @@ import java.lang.reflect.Type; -import javax.json.bind.serializer.DeserializationContext; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.stream.JsonParser; +import jakarta.json.bind.serializer.DeserializationContext; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.stream.JsonParser; import org.bson.types.ObjectId; diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdSerializer.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdSerializer.java index 4ef231fd18241..97b64a7520020 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdSerializer.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/jsonb/ObjectIdSerializer.java @@ -1,8 +1,8 @@ package io.quarkus.mongodb.panache.common.jsonb; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; import org.bson.types.ObjectId; diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/BeanUtils.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/BeanUtils.java index 5e6f4d7a71f17..7443ef8801767 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/BeanUtils.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/BeanUtils.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.function.Predicate; -import javax.inject.Named; +import jakarta.inject.Named; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/MongoOperations.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/MongoOperations.java index 6f6343c591484..c2285c29c4356 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/MongoOperations.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/MongoOperations.java @@ -10,11 +10,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.bson.BsonDocument; import org.bson.BsonDocumentWriter; diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityRepository.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityRepository.java index af593bb63096f..d7928748978c3 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityRepository.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.mongodb.panache.mongoentity; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepository; diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java index f353e7b2db9f9..43daf2c95a519 100644 --- a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.java +++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/mongoentity/MongoEntityTest.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.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java index 0215894cb7a87..37551efedcfea 100644 --- a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java +++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java @@ -6,7 +6,7 @@ import java.lang.reflect.Modifier; import java.util.List; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java index a02f85c26ce96..57782d23f21b2 100644 --- a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java +++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.FieldInfo; import org.jboss.logging.Logger; diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/NoopUpdateExecutor.java b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/NoopUpdateExecutor.java index d3023410eff75..6c55ba446c636 100644 --- a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/NoopUpdateExecutor.java +++ b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/NoopUpdateExecutor.java @@ -2,7 +2,7 @@ import java.util.function.Supplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.rest.data.panache.runtime.UpdateExecutor; diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java index 03c803882dd41..064fe92c76945 100644 --- a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java +++ b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.mongodb.rest.data.panache.runtime; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jboss.logging.Logger; diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java index 7df0d343d60ac..7b96b464baacb 100644 --- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java +++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java @@ -11,9 +11,9 @@ private PanacheConstants() { public static final DotName DOTNAME_GENERATE_BRIDGE = DotName.createSimple(GenerateBridge.class.getName()); - public static final String JAXB_ANNOTATION_PREFIX = "Ljavax/xml/bind/annotation/"; + public static final String JAXB_ANNOTATION_PREFIX = "Ljakarta/xml/bind/annotation/"; public static final String META_INF_PANACHE_ARCHIVE_MARKER = "META-INF/panache-archive.marker"; - private static final String JAXB_TRANSIENT_BINARY_NAME = "javax/xml/bind/annotation/XmlTransient"; + private static final String JAXB_TRANSIENT_BINARY_NAME = "jakarta/xml/bind/annotation/XmlTransient"; public static final String JAXB_TRANSIENT_SIGNATURE = "L" + JAXB_TRANSIENT_BINARY_NAME + ";"; private static final String JSON_PROPERTY_BINARY_NAME = "com/fasterxml/jackson/annotation/JsonProperty"; diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java index ab4bf1ef76209..82cf77985d58c 100644 --- a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java +++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java @@ -8,7 +8,7 @@ import java.util.Optional; import java.util.Set; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java index 26662b646e1c2..2a94eb832dabb 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java @@ -4,10 +4,10 @@ import java.util.Arrays; import java.util.List; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; -import javax.ws.rs.Path; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import org.apache.commons.lang3.StringUtils; import org.jboss.jandex.AnnotationInstance; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMethodListenerImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMethodListenerImplementor.java index 18284c35f3ade..957c2ac4f9bad 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMethodListenerImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMethodListenerImplementor.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.function.BiConsumer; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.MethodInfo; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java index fc24f80f9b3f6..f3f719f766948 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java @@ -5,9 +5,9 @@ import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.responseType; import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.uniType; -import javax.validation.Valid; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.validation.Valid; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.deployment.Capabilities; import io.quarkus.gizmo.ClassCreator; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/CountMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/CountMethodImplementor.java index a7406f0118fb7..334875ce9f402 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/CountMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/CountMethodImplementor.java @@ -4,7 +4,7 @@ import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.responseType; import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.uniType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import io.quarkus.deployment.Capabilities; import io.quarkus.gizmo.ClassCreator; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java index 5585cdc0876f5..6cb73e874a5b9 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java @@ -5,7 +5,7 @@ import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.responseType; import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.uniType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import io.quarkus.deployment.Capabilities; import io.quarkus.gizmo.BranchResult; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java index 94c330a5dda06..5f59df6fe30a0 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java @@ -5,7 +5,7 @@ import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.responseType; import static io.quarkus.rest.data.panache.deployment.utils.SignatureMethodCreator.uniType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import io.quarkus.deployment.Capabilities; import io.quarkus.gizmo.BranchResult; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java index 066b82c66c855..178987a73fa72 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.jandex.Type; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java index 1af632b140993..c46aadc3c26b1 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java @@ -2,18 +2,18 @@ import java.util.Collection; -import javax.ws.rs.Consumes; -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.Context; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +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.Context; +import jakarta.ws.rs.core.Response; import org.jboss.jandex.AnnotationInstance; import org.jboss.logging.Logger; @@ -42,7 +42,7 @@ public abstract class StandardMethodImplementor implements MethodImplementor { private static final String OPENAPI_CONTENT_ANNOTATION = OPENAPI_PACKAGE + ".media.Content"; private static final String OPENAPI_SCHEMA_ANNOTATION = OPENAPI_PACKAGE + ".media.Schema"; private static final String SCHEMA_TYPE_ARRAY = "ARRAY"; - private static final String ROLES_ALLOWED_ANNOTATION = "javax.annotation.security.RolesAllowed"; + private static final String ROLES_ALLOWED_ANNOTATION = "jakarta.annotation.security.RolesAllowed"; private static final Logger LOGGER = Logger.getLogger(StandardMethodImplementor.class); protected final ResponseImplementor responseImplementor; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java index 70bf8ec63efef..baa8f7fa0a87b 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java @@ -8,9 +8,9 @@ import java.lang.annotation.Annotation; import java.util.function.Supplier; -import javax.validation.Valid; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.validation.Valid; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java index 2c048a0e6f817..933478e01c022 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java @@ -5,7 +5,7 @@ import java.lang.annotation.Annotation; import java.util.Collection; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java index 7925f16932eb4..b788844076289 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java index 336e8996aa31c..08723f99ebe59 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java @@ -7,9 +7,9 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.gizmo.AssignableResultHandle; import io.quarkus.gizmo.BranchResult; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java index 2b0f049d8cce4..e2db59b6b95fd 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java @@ -5,10 +5,10 @@ import java.lang.annotation.Annotation; import java.net.URI; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SignatureMethodCreator.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SignatureMethodCreator.java index b2531ab20cd22..20dddea276b35 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SignatureMethodCreator.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SignatureMethodCreator.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import io.quarkus.gizmo.ClassCreator; import io.quarkus.gizmo.MethodCreator; diff --git a/extensions/panache/rest-data-panache/runtime/pom.xml b/extensions/panache/rest-data-panache/runtime/pom.xml index ea2429be4cbb4..c905319dfba34 100644 --- a/extensions/panache/rest-data-panache/runtime/pom.xml +++ b/extensions/panache/rest-data-panache/runtime/pom.xml @@ -22,8 +22,8 @@ quarkus-hal - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api jakarta.validation diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java index ac61239ed1538..bbdaf4383bf57 100644 --- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java +++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java @@ -1,14 +1,14 @@ package io.quarkus.rest.data.panache.runtime.sort; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import java.util.Collections; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; @Provider @SortQueryParamValidator diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java index 58a33e834290f..5a3b1cf6d8dfb 100644 --- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java +++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Retention(RetentionPolicy.RUNTIME) diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java index 5b463fae49ead..7f10d70642dc2 100644 --- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java +++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java @@ -1,17 +1,17 @@ package io.quarkus.rest.data.panache.runtime.sort; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/extensions/picocli/deployment/src/test/java/io/quarkus/picocli/deployment/AvailableConfigSourcesTest.java b/extensions/picocli/deployment/src/test/java/io/quarkus/picocli/deployment/AvailableConfigSourcesTest.java index 74a96343417c1..eafb136eb7512 100644 --- a/extensions/picocli/deployment/src/test/java/io/quarkus/picocli/deployment/AvailableConfigSourcesTest.java +++ b/extensions/picocli/deployment/src/test/java/io/quarkus/picocli/deployment/AvailableConfigSourcesTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java index 08160a271738e..f87f7b27c6664 100644 --- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java +++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java @@ -1,8 +1,8 @@ package io.quarkus.picocli.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.literal.NamedLiteral; import io.quarkus.picocli.runtime.annotations.TopCommand; import picocli.CommandLine; diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliCommandLineProducer.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliCommandLineProducer.java index 9f3e626975435..777d6119dc6be 100644 --- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliCommandLineProducer.java +++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliCommandLineProducer.java @@ -1,8 +1,8 @@ package io.quarkus.picocli.runtime; -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 io.quarkus.arc.DefaultBean; import io.quarkus.runtime.annotations.CommandLineArguments; diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java index 33393a9dd5bce..00a2f606b642a 100644 --- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java +++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java @@ -1,7 +1,7 @@ package io.quarkus.picocli.runtime; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; import io.quarkus.runtime.QuarkusApplication; import picocli.CommandLine; diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/annotations/TopCommand.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/annotations/TopCommand.java index bc6b3a0b8b393..44106c7f16e95 100644 --- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/annotations/TopCommand.java +++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/annotations/TopCommand.java @@ -9,10 +9,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** - * Top-level command for Picocli CommandLine instance. This qualifier can be used together with {@link javax.inject.Named}. + * Top-level command for Picocli CommandLine instance. This qualifier can be used together with {@link jakarta.inject.Named}. * Runtime property quarkus.picocli.top-command should be used to specify which Named TopCommand will be used. */ @Qualifier diff --git a/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java b/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java index 7fd44349f6266..f1b8dc888bbd4 100644 --- a/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java +++ b/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.logging.Level; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; import org.quartz.Job; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java index e69aad26f965c..7e58c0c63a3d3 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionSkipTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java index 919ccbfe3de38..495db7d7c82b4 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConditionalExecutionTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConfigureInstanceIdTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConfigureInstanceIdTest.java index 6e59224833bfc..5a0f87a4426c6 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConfigureInstanceIdTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConfigureInstanceIdTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java index 44560bf75a1c4..725479588688a 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DisabledSchedulerTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextTest.java index f87d96e918dbb..311cff7b083a3 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextWithRunOnQuartzThreadTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextWithRunOnQuartzThreadTest.java index 3f8a8623b04f4..b34a4e504ac90 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextWithRunOnQuartzThreadTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicatedContextWithRunOnQuartzThreadTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FailedExecutionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FailedExecutionTest.java index 2b2dbc93d9122..8b77a62e52be2 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FailedExecutionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FailedExecutionTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FireTimeTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FireTimeTest.java index feeb87984538d..046a6890a4440 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FireTimeTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/FireTimeTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.data.TemporalUnitWithinOffset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/GlobalMisfirePolicyTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/GlobalMisfirePolicyTest.java index 35066a6cad100..9ce9937ca3923 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/GlobalMisfirePolicyTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/GlobalMisfirePolicyTest.java @@ -3,7 +3,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.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java index 37133050c0d8b..ce85befcdc817 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java index 1534809671dcb..50c8aaef275a7 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java @@ -5,11 +5,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -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.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java index 94d7ce3d86baf..5099ff68e5167 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java index 4fa5329e6e51d..085fca5b45d78 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidCronExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.quartz.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java index 45f5f10247435..8f0fe0add9877 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidDelayedExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.quartz.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java index 3cdb17219505e..64897cfecad07 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidEveryExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.quartz.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ListSchedulerJobsTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ListSchedulerJobsTest.java index d342a3c0dfa62..6ded8fa815604 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ListSchedulerJobsTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ListSchedulerJobsTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MisfirePolicyTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MisfirePolicyTest.java index 84dcae32cc0db..e3cf700e22d59 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MisfirePolicyTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MisfirePolicyTest.java @@ -3,7 +3,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.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java index ccbe7505656f3..2400304e1aaf6 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/NoExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.quartz.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueCronExecutionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueCronExecutionTest.java index d06f384f4a6b9..455190483bbfa 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueCronExecutionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueCronExecutionTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueExecutionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueExecutionTest.java index 09c8f3f4ec501..a4e9938204db3 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueExecutionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/OverdueExecutionTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java index 86f75f5808900..1b0ee16cc533a 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodExpressionTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.interceptor.Interceptor; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java index 7192caf70358d..1b5ca70040564 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedMethodTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java index b2b883774891f..f0259d5a92111 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/PausedResumedMethodTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java index 219011dac67ca..aa399c12eddbb 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java index d4161a2ff89cd..de625ad8705a0 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestContextJobs.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestContextJobs.java index 1512c1a1afdb9..9bc2c103e35db 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestContextJobs.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RequestContextJobs.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import io.quarkus.scheduler.Scheduled; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SuccessfulExecutionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SuccessfulExecutionTest.java index 9fcbb56f70d85..c093675e2ee9d 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SuccessfulExecutionTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SuccessfulExecutionTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java index 6f49aa59ddb41..6edbb5a450e83 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/metrics/MpTimedTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/nonblocking/NonBlockingScheduledMethodTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/nonblocking/NonBlockingScheduledMethodTest.java index e25d268c69547..9de042427c96d 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/nonblocking/NonBlockingScheduledMethodTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/nonblocking/NonBlockingScheduledMethodTest.java @@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ForcedStartModeJobsTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ForcedStartModeJobsTest.java index 3934ab8b275a4..34e05bc2c04f6 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ForcedStartModeJobsTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ForcedStartModeJobsTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/HaltedStartModeJobsTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/HaltedStartModeJobsTest.java index 7c5f789d04fb0..a7ef7675aef53 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/HaltedStartModeJobsTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/HaltedStartModeJobsTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ProgrammaticJobsTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ProgrammaticJobsTest.java index e444f3c51b8aa..ed92d24c15ed9 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ProgrammaticJobsTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/programmatic/ProgrammaticJobsTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java index ed35e541c7d27..7d917e437b4a1 100644 --- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java +++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/subclass/InterceptedJobClassTest.java @@ -5,11 +5,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -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.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzSchedulerImpl.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzSchedulerImpl.java index c74972398d34d..610385c369d8a 100644 --- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzSchedulerImpl.java +++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzSchedulerImpl.java @@ -19,19 +19,19 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.jboss.logging.Logger; import org.quartz.CronScheduleBuilder; diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java index e4bcdd4a47df8..1ce27920d440c 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java @@ -30,7 +30,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java index b09d510666421..9e672905c2764 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/AsyncTest.java @@ -6,7 +6,7 @@ import java.math.RoundingMode; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java index c3770401554bb..a9d4564479892 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java @@ -4,7 +4,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/Hello.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/Hello.java index 7ea645cf0da04..1bbacb8be4ad8 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/Hello.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/Hello.java @@ -1,7 +1,7 @@ package io.quarkus.qute.deployment; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; @ApplicationScoped @Named @@ -11,4 +11,4 @@ public String ping() { return "pong"; } -} \ No newline at end of file +} diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java index 5312c248903a4..2e68a57500d07 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/MultiTest.java @@ -5,7 +5,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java index 4c55e93394d45..3e32d1500e078 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/PropertyNotFoundDevModeTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java index e17f52a8ce134..955452e563303 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java index e05594bcbb7ac..45733d45f303c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java @@ -5,7 +5,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java index ffd4cd9aff3ea..e0ce40da0bc4c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TreeMapDataTest.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.TreeMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java index e412034798ea6..f809cecedcc98 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java @@ -3,8 +3,8 @@ import static io.quarkus.qute.TemplateInstance.SELECTED_VARIANT; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java index 9b137ed7509ee..6a341edce2807 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/cache/CacheTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/cache/CacheTest.java index 869e2dca1b6d4..accb560af0443 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/cache/CacheTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/cache/CacheTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java index a1160b5f8b7df..a8bfe9021dfd3 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java @@ -3,7 +3,7 @@ import static io.quarkus.qute.TemplateInstance.SELECTED_VARIANT; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java index 35601003987b0..bc9cbbd0b0082 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/currentrequest/CurrentRequestTest.java @@ -2,7 +2,7 @@ import static io.restassured.RestAssured.when; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/encoding/CustomEncodingTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/encoding/CustomEncodingTest.java index 958cbe3ca57bf..9b25f3e29f574 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/encoding/CustomEncodingTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/encoding/CustomEncodingTest.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.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/resolver/CustomResolversTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/resolver/CustomResolversTest.java index 6df90b50bab46..d6bf336e3d3d1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/resolver/CustomResolversTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/resolver/CustomResolversTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionFactory.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionFactory.java index 8ea7b30b56d62..356931ff103a5 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionFactory.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionFactory.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.qute.EngineConfiguration; import io.quarkus.qute.ResultNode; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionHelperTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionHelperTest.java index f884a5b6ba541..78e048aadbbbe 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionHelperTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/CustomSectionHelperTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/StringProducer.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/StringProducer.java index 3c42c7e84cabf..7a429ba3295d5 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/StringProducer.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/engineconfigurations/section/StringProducer.java @@ -1,6 +1,6 @@ package io.quarkus.qute.deployment.engineconfigurations.section; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; public class StringProducer { diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumIgnoredTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumIgnoredTest.java index 7b582d1267580..baba4508718a9 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumIgnoredTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumIgnoredTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumInvalidTargetTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumInvalidTargetTest.java index 1e11e9b3c9598..ed26973784e65 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumInvalidTargetTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumInvalidTargetTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumTest.java index fb27a1da4fea2..382444f8fb76f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumTest.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumValidationSuccessTest.java index 382ae1cfca9d1..822048b3a4229 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/enums/TemplateEnumValidationSuccessTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java index b46b2229231c4..fd39baf547a10 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/AdditionalTemplatePathExcludeTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java index 98731b95b8b75..24bae130b7755 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/exclude/TemplatePathExcludeTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/AssignabilityTemplateExtensionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/AssignabilityTemplateExtensionTest.java index e89cfc801099b..8f936e047f2e1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/AssignabilityTemplateExtensionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/AssignabilityTemplateExtensionTest.java @@ -6,7 +6,7 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java index 25deb510fab1a..976fe291bc338 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/CollectionTemplateExtensionsTest.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java index 9f0ffcb3b67ed..6d553d6bf97d2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java index 946257f9c64d0..59970d6ec4dbe 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java @@ -6,9 +6,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java index f1776becba68f..6d325f78ceda1 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java @@ -7,8 +7,8 @@ import java.util.EnumSet; import java.util.Set; -import javax.enterprise.event.TransactionPhase; -import javax.inject.Inject; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java index 51d2a954df41d..8819a9f6e9bfd 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java index 9833dba9eff2b..dfae6097eb53f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/StringTemplateExtensionsTest.java @@ -5,7 +5,7 @@ import java.time.LocalDateTime; import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java index b5b6873dc6308..45e01b5417bb4 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java @@ -4,7 +4,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java index 727850552854f..593b1872de8e2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java index e4f758fd094d9..ec758c43a46f3 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java @@ -11,7 +11,7 @@ import java.util.Locale; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java index a8288591c856d..3a51aa84c425d 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java @@ -6,7 +6,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalOverrideTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalOverrideTest.java index 0302e82202e5b..d78689d7d071c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalOverrideTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalOverrideTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalTest.java index 8c4c898bcf9aa..de372ee5c691a 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/globals/TemplateGlobalTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/LocalizedFileResourceBundleNameTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/LocalizedFileResourceBundleNameTest.java index 32368f50be0c7..569e160909d4c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/LocalizedFileResourceBundleNameTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/LocalizedFileResourceBundleNameTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleCustomDefaultLocaleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleCustomDefaultLocaleTest.java index 3f7967fb8e949..65fefeb84c207 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleCustomDefaultLocaleTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleCustomDefaultLocaleTest.java @@ -4,7 +4,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java index 68e31138f651f..5a4ae10a48160 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLocaleTest.java @@ -4,7 +4,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java index 8b41a3facf89d..f94a3a2b1e5f4 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleLogicalLineTest.java @@ -4,7 +4,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java index 29991924da327..3b998b0a02af6 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java @@ -5,7 +5,7 @@ import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java index bf008d0aad546..54f45654c9924 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/NestedMessageBundleDevModeTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java index a71212b6c6834..2bfd4bf074e4a 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/include/IncludeTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java index 5e7ca7bb96d2c..e3bca7a111002 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectNamespaceResolverTest.java @@ -5,10 +5,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.LongAdder; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionFailedTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionFailedTest.java index 49e44a7077d2b..3cb2b28440fe8 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionFailedTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionFailedTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java index f0b271d3f9b22..36daed32a840f 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanIterableReturnTypeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanIterableReturnTypeTest.java index 1314c6e301d19..32ff849ef855b 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanIterableReturnTypeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanIterableReturnTypeTest.java @@ -4,9 +4,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java index 04937fcd9d1d0..61eb4f804d105 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanPropertyNotFoundTest.java @@ -4,8 +4,8 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java index d87e511059210..097886c4273a2 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java @@ -6,8 +6,8 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java index 24f02a260572f..63302862bee89 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java @@ -5,9 +5,9 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/IterationMetadataPrefixTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/IterationMetadataPrefixTest.java index 712d6ae8a37b4..a7b8826c1f75b 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/IterationMetadataPrefixTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/IterationMetadataPrefixTest.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.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java index ca3ffa7eefe2c..7df9033e1f718 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/loop/LoopTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java index 29a45520e4061..0a6f690239333 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java index c08674edb0a4e..7f839c8810864 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java index 812bb1ffee26b..789b4edb4b351 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java index b7265d7377a46..7ccb4b841be77 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/removestandalonelines/DoNotRemoveStandaloneLinesTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/MultipleTemplatesDirectoryTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/MultipleTemplatesDirectoryTest.java index 59588f0470a65..7d07be7c8731c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/MultipleTemplatesDirectoryTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/MultipleTemplatesDirectoryTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java index 357d6377c8162..4e5452e0d7b3c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/scanning/WrongTemplatesDirectoryTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java index 8e5418cf3e648..506128af02faa 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagIncludeTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java index b84169e658311..c650796fd9e10 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagNameCollisionTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java index b018d5fa88038..8f72e6753be53 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagWithQuteExtensionIncludeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagWithQuteExtensionIncludeTest.java index cc699fd1c71c8..4b876ad823b4c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagWithQuteExtensionIncludeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/tag/UserTagWithQuteExtensionIncludeTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/templatelocator/CustomTemplateLocatorTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/templatelocator/CustomTemplateLocatorTest.java index 99ebfd786cf80..26ee729793825 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/templatelocator/CustomTemplateLocatorTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/templatelocator/CustomTemplateLocatorTest.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java index 9de2a781f37b3..7ee4db915ecb7 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateRequireTypeSafeTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DataNamespaceValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DataNamespaceValidationTest.java index 958bf831ee09f..94fabc3d23f99 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DataNamespaceValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DataNamespaceValidationTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java index ecfef3167b262..dc564a6e1eefb 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/DefaultMethodValidationSuccessTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java index 2488ba7ff9928..34591416620c3 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/InterfaceValidationSuccessTest.java @@ -4,7 +4,7 @@ import java.util.Collections; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java index 6fad66fbd1355..8f69e91e4cb40 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java index 4626412a40190..9b8d25dc24a89 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/NestedVirtualMethodSuccessTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java index 1443726a01d8b..c7ac99c3c299e 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ObjectValidationSuccessTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/OrOperatorTemplateExtensionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/OrOperatorTemplateExtensionTest.java index 76280ac44ff6d..a9e05f2abcff8 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/OrOperatorTemplateExtensionTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/OrOperatorTemplateExtensionTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationDefaultValueTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationDefaultValueTest.java index 15f225d81feed..357f638e92437 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationDefaultValueTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationDefaultValueTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java index de223ed9e013d..7d31173bc0d63 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ParamDeclarationTest.java @@ -1,6 +1,6 @@ package io.quarkus.qute.deployment.typesafe; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java index d2086e28976df..739ed7939d785 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java index df8ca71ecd23d..659b3b40b9e73 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeJavaLangTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java index a616a95a6933d..6e1f08f68fcb6 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java index f9b0eb66115f9..3a09b09cca50c 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java index 2f1c792b59246..7495e239eea5a 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java @@ -4,7 +4,7 @@ import java.util.Collections; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java index 559395bff163e..c760f5a61b200 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java index 4b3b1deeff97e..0cf8f640c6601 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/varargs/VarargsMethodTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/Localized.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/Localized.java index 2da4b48f3e170..1e3ef83f9d0e1 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/Localized.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/Localized.java @@ -10,8 +10,8 @@ import java.lang.annotation.Target; import java.util.Locale; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Marks a localized message bundle interface. diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java index 11abb54d4da73..976506300ecb6 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java @@ -6,9 +6,9 @@ import java.util.Map.Entry; import java.util.concurrent.CompletionStage; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java index d82acd262c595..cb62d34d281f0 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java @@ -2,8 +2,8 @@ import java.net.URLConnection; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java index 5246fb27b87de..c4633c9028a56 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java @@ -18,13 +18,13 @@ import java.util.concurrent.ConcurrentMap; import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; import org.jboss.logging.Logger; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java index 66724f59172bc..36df02eac2e29 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java @@ -1,6 +1,6 @@ package io.quarkus.qute.runtime; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; import io.quarkus.qute.Location; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java index 763d6b59da9f0..d9af1f75c1b69 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java @@ -14,10 +14,10 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/cache/CacheConfigurator.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/cache/CacheConfigurator.java index cfe84d1b81b99..983b5c739af2e 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/cache/CacheConfigurator.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/cache/CacheConfigurator.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.Function; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.quarkus.cache.Cache; import io.quarkus.cache.CacheName; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java index 9d3992ce1dd4e..70852f76d575f 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java @@ -7,7 +7,7 @@ import java.util.ListIterator; import java.util.NoSuchElementException; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import io.quarkus.qute.TemplateExtension; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java index a2cb2958cbb5e..745cb5d1e138c 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java @@ -5,7 +5,7 @@ import java.util.Optional; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import org.eclipse.microprofile.config.ConfigProvider; @@ -43,4 +43,4 @@ static Object integerProperty(String propertyName) { Optional val = ConfigProvider.getConfig().getOptionalValue(propertyName, Integer.class); return val.isPresent() ? val.get() : Results.NotFound.from(propertyName); } -} \ No newline at end of file +} diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java index 68c08442a85c0..e988e48216856 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java @@ -4,7 +4,7 @@ import java.util.Map; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import io.quarkus.qute.Results; import io.quarkus.qute.TemplateExtension; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java index 20f2d2a56906c..b42ca90ed8ec8 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java @@ -1,6 +1,6 @@ package io.quarkus.qute.runtime.extensions; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import io.quarkus.qute.TemplateExtension; @@ -56,4 +56,4 @@ static Long subtractFromLong(Long number, String name, Long other) { return number - other; } -} \ No newline at end of file +} diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/OrOperatorTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/OrOperatorTemplateExtensions.java index 685a2d2ed9ec3..59e3456cf6e5c 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/OrOperatorTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/OrOperatorTemplateExtensions.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import io.quarkus.qute.Results; import io.quarkus.qute.TemplateExtension; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/StringTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/StringTemplateExtensions.java index 01c4f305d8f26..0d2866196da3c 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/StringTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/StringTemplateExtensions.java @@ -2,7 +2,7 @@ import java.util.Locale; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import io.quarkus.qute.TemplateExtension; diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java index b8a10e73b5ca8..8ff8a2e347d9f 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java @@ -13,7 +13,7 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import io.quarkus.qute.TemplateExtension; diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java index bc429c78993f7..c86b92ce5058a 100644 --- a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java +++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Qualifier used to specify which reactive datasource will be injected. diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java index 91616c943f779..b0d804266c96b 100644 --- a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java +++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.Bean; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java index 10e5ddb2cf151..62d1e4691166d 100644 --- a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java +++ b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java index 7dc4b2276402a..299821dd49d23 100644 --- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java +++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java index 17d18fb5c8a26..72c046f4c33cb 100644 --- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java +++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java @@ -6,10 +6,10 @@ import java.util.Map.Entry; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.Bean; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.Bean; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/reactive-mssql-client/deployment/src/main/java/io/quarkus/reactive/mssql/client/deployment/ReactiveMSSQLClientProcessor.java b/extensions/reactive-mssql-client/deployment/src/main/java/io/quarkus/reactive/mssql/client/deployment/ReactiveMSSQLClientProcessor.java index 15d22dc1a515d..b9a865020d1a1 100644 --- a/extensions/reactive-mssql-client/deployment/src/main/java/io/quarkus/reactive/mssql/client/deployment/ReactiveMSSQLClientProcessor.java +++ b/extensions/reactive-mssql-client/deployment/src/main/java/io/quarkus/reactive/mssql/client/deployment/ReactiveMSSQLClientProcessor.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTestResource.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTestResource.java index 19b27d85611c9..a9865a08ac288 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTestResource.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CredentialsTestResource.java @@ -4,11 +4,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 io.vertx.mutiny.mssqlclient.MSSQLPool; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CustomCredentialsProvider.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CustomCredentialsProvider.java index fe9237fcec09f..e7df2237791cb 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CustomCredentialsProvider.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/CustomCredentialsProvider.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevModeResource.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevModeResource.java index 32de811a4c67c..ba7877c9cd42e 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevModeResource.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevModeResource.java @@ -5,12 +5,12 @@ import java.util.concurrent.CompletableFuture; 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 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 io.vertx.mssqlclient.MSSQLPool; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevServicesMsSQLDatasourceTestCase.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevServicesMsSQLDatasourceTestCase.java index 13d9012c7e235..2def78c419838 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevServicesMsSQLDatasourceTestCase.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/DevServicesMsSQLDatasourceTestCase.java @@ -7,7 +7,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/LocalhostMSSQLPoolCreator.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/LocalhostMSSQLPoolCreator.java index b4a045f6255de..fbfd5891b076b 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/LocalhostMSSQLPoolCreator.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/LocalhostMSSQLPoolCreator.java @@ -1,6 +1,6 @@ package io.quarkus.reactive.mssql.client; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.vertx.mssqlclient.MSSQLPool; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java index 90d2b1ba5d055..c07a671754e14 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesAndMSSQLPoolCreatorsTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesAndMSSQLPoolCreatorsTest.java index f89109ab4c95f..d601cb27be725 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesAndMSSQLPoolCreatorsTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesAndMSSQLPoolCreatorsTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java index 44f38157f406c..ead0685bae68a 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleDataSourcesTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleMSSQLPoolCreatorsForSameDatasourceTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleMSSQLPoolCreatorsForSameDatasourceTest.java index 1fb1e478b4f99..68dbd119a3634 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleMSSQLPoolCreatorsForSameDatasourceTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MultipleMSSQLPoolCreatorsForSameDatasourceTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java b/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java index 788320fc3fea3..ac34f3bc6e60d 100644 --- a/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java +++ b/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/health/ReactiveMSSQLDataSourcesHealthCheck.java b/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/health/ReactiveMSSQLDataSourcesHealthCheck.java index e1c981075a1d0..35537917a3399 100644 --- a/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/health/ReactiveMSSQLDataSourcesHealthCheck.java +++ b/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/health/ReactiveMSSQLDataSourcesHealthCheck.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; import org.eclipse.microprofile.health.Readiness; diff --git a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java index 42266feac61df..0912aa814ef25 100644 --- a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java +++ b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTestResource.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTestResource.java index 125d118362ab5..82d55b5fd9cbd 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTestResource.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CredentialsTestResource.java @@ -4,11 +4,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 io.vertx.mutiny.mysqlclient.MySQLPool; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CustomCredentialsProvider.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CustomCredentialsProvider.java index a55663e9e44e5..bc345a17c0d37 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CustomCredentialsProvider.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/CustomCredentialsProvider.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevModeResource.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevModeResource.java index 6adb24dcedf51..1061b7459bd50 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevModeResource.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevModeResource.java @@ -5,12 +5,12 @@ import java.util.concurrent.CompletableFuture; 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 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 io.vertx.mysqlclient.MySQLPool; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevServicesMySQLDatasourceTestCase.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevServicesMySQLDatasourceTestCase.java index 7d55f33663932..316524a5b2c47 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevServicesMySQLDatasourceTestCase.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/DevServicesMySQLDatasourceTestCase.java @@ -7,7 +7,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LocalhostMySQLPoolCreator.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LocalhostMySQLPoolCreator.java index ec8c7a798d0a2..71324a7b6d3b1 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LocalhostMySQLPoolCreator.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LocalhostMySQLPoolCreator.java @@ -1,6 +1,6 @@ package io.quarkus.reactive.mysql.client; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.vertx.mysqlclient.MySQLPool; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesAndMySQLPoolCreatorsTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesAndMySQLPoolCreatorsTest.java index e0b5a88258f4f..1ce79acd7e128 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesAndMySQLPoolCreatorsTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesAndMySQLPoolCreatorsTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java index f6c8162b33b86..cf613920812e0 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleMySQLPoolCreatorsForSameDatasourceTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleMySQLPoolCreatorsForSameDatasourceTest.java index 6fd00cf2d7748..5016026dae1ea 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleMySQLPoolCreatorsForSameDatasourceTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleMySQLPoolCreatorsForSameDatasourceTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java index 47ec1121c0df7..6e20a49ce676d 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java index 28e9f8a3440e5..d5f58d0fb7d16 100644 --- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java +++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java index b7875f7e25cfc..81470e5d9d0e6 100644 --- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java +++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; import org.eclipse.microprofile.health.Readiness; diff --git a/extensions/reactive-oracle-client/deployment/src/main/java/io/quarkus/reactive/oracle/client/deployment/ReactiveOracleClientProcessor.java b/extensions/reactive-oracle-client/deployment/src/main/java/io/quarkus/reactive/oracle/client/deployment/ReactiveOracleClientProcessor.java index 1385081e1d037..039542c118298 100644 --- a/extensions/reactive-oracle-client/deployment/src/main/java/io/quarkus/reactive/oracle/client/deployment/ReactiveOracleClientProcessor.java +++ b/extensions/reactive-oracle-client/deployment/src/main/java/io/quarkus/reactive/oracle/client/deployment/ReactiveOracleClientProcessor.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CredentialsTestResource.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CredentialsTestResource.java index 4ae4988ab1aae..6ccb5e5460e31 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CredentialsTestResource.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CredentialsTestResource.java @@ -4,11 +4,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 io.vertx.mutiny.oracleclient.OraclePool; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CustomCredentialsProvider.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CustomCredentialsProvider.java index 935ed6880aac7..e08084c2e17a7 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CustomCredentialsProvider.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/CustomCredentialsProvider.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevModeResource.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevModeResource.java index c92be25a8e629..2dd4221f96c86 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevModeResource.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevModeResource.java @@ -4,12 +4,12 @@ import java.util.concurrent.CompletableFuture; 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 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 io.vertx.oracleclient.OraclePool; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevServicesOracleDatasourceTestCase.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevServicesOracleDatasourceTestCase.java index 10ccb9b422676..b9834968136cd 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevServicesOracleDatasourceTestCase.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/DevServicesOracleDatasourceTestCase.java @@ -7,7 +7,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/LocalhostOraclePoolCreator.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/LocalhostOraclePoolCreator.java index ab4b483255b6a..7415546a0e165 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/LocalhostOraclePoolCreator.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/LocalhostOraclePoolCreator.java @@ -1,6 +1,6 @@ package io.quarkus.reactive.oracle.client; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.vertx.oracleclient.OraclePool; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesAndOraclePoolCreatorsTest.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesAndOraclePoolCreatorsTest.java index fd0cae86bc907..4aa595bb8a422 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesAndOraclePoolCreatorsTest.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesAndOraclePoolCreatorsTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesTest.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesTest.java index 909ba5bf7fd5f..d8ed5f097ccf8 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleDataSourcesTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleOraclePoolCreatorsForSameDatasourceTest.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleOraclePoolCreatorsForSameDatasourceTest.java index 8e0987f9ba5fa..9605837f343e1 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleOraclePoolCreatorsForSameDatasourceTest.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/MultipleOraclePoolCreatorsForSameDatasourceTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java index 15a236c5cf2e9..217882d82593b 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java b/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java index e28834c0dbc09..a32dfcf4bcb5b 100644 --- a/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java +++ b/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/health/ReactiveOracleDataSourcesHealthCheck.java b/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/health/ReactiveOracleDataSourcesHealthCheck.java index c11b918b802bb..fa462c96ac2b5 100644 --- a/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/health/ReactiveOracleDataSourcesHealthCheck.java +++ b/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/health/ReactiveOracleDataSourcesHealthCheck.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; import org.eclipse.microprofile.health.Readiness; diff --git a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java index 1eff23617ecfd..b0f38c3411bb0 100644 --- a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java +++ b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java @@ -9,7 +9,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTestResource.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTestResource.java index 1640102676f91..dff7149adb1ee 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTestResource.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CredentialsTestResource.java @@ -4,11 +4,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 io.vertx.mutiny.pgclient.PgPool; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CustomCredentialsProvider.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CustomCredentialsProvider.java index a97bb1da94885..0094b3bea01b3 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CustomCredentialsProvider.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/CustomCredentialsProvider.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevModeResource.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevModeResource.java index 5f803cb1a19a6..20a03208cbb85 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevModeResource.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevModeResource.java @@ -4,12 +4,12 @@ import java.util.concurrent.CompletableFuture; 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 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 io.vertx.pgclient.PgPool; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevServicesPostgresqlDatasourceTestCase.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevServicesPostgresqlDatasourceTestCase.java index 7866181f5fba7..9c678d0cb2d94 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevServicesPostgresqlDatasourceTestCase.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/DevServicesPostgresqlDatasourceTestCase.java @@ -7,7 +7,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LocalhostPgPoolCreator.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LocalhostPgPoolCreator.java index 4df42b98dde69..79ec7eb2890b1 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LocalhostPgPoolCreator.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LocalhostPgPoolCreator.java @@ -1,6 +1,6 @@ package io.quarkus.reactive.pg.client; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.vertx.pgclient.PgPool; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesAndPgPoolCreatorsTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesAndPgPoolCreatorsTest.java index bc5b7bfbcb5c8..ccd0e4ff09be7 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesAndPgPoolCreatorsTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesAndPgPoolCreatorsTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java index cfac91e8dfccb..1cd8c0e4f3b37 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultiplePgPoolCreatorsForSameDatasourceTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultiplePgPoolCreatorsForSameDatasourceTest.java index 325e6865a84ca..ea8b3a5e5b30e 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultiplePgPoolCreatorsForSameDatasourceTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultiplePgPoolCreatorsForSameDatasourceTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java index d234cfa5d7855..ba903f7bc6d91 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletableFuture; 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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java index 9760ee690d645..853f4e7dba23a 100644 --- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java +++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; import org.jboss.logging.Logger; diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java index 0fd0aacfa022e..c0228a3c99869 100644 --- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java +++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; import org.eclipse.microprofile.health.Readiness; diff --git a/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java b/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java index 7e9d70bc5fd4a..3d5cc43da663d 100644 --- a/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java +++ b/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java @@ -9,9 +9,9 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; -import javax.enterprise.context.spi.Context; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; import org.jboss.jandex.DotName; @@ -181,11 +181,11 @@ class Methods { static final MethodDescriptor OPTIONAL_OF_NULLABLE = MethodDescriptor .ofMethod(Optional.class, "ofNullable", Optional.class, Object.class); - static final String VALIDATION_VALIDATOR = "javax.validation.Validator"; - static final String VALIDATION_CONSTRAINT_VIOLATION_EXCEPTION = "javax.validation.ConstraintViolationException"; + static final String VALIDATION_VALIDATOR = "jakarta.validation.Validator"; + static final String VALIDATION_CONSTRAINT_VIOLATION_EXCEPTION = "jakarta.validation.ConstraintViolationException"; static final MethodDescriptor VALIDATION_GET_VALIDATOR = MethodDescriptor.ofMethod(ValidationSupport.class, "getValidator", - "javax.validation.Validator", ArcContainer.class); + "jakarta.validation.Validator", ArcContainer.class); static final MethodDescriptor VALIDATION_MAP_VIOLATIONS_TO_JSON = MethodDescriptor .ofMethod(ValidationSupport.class, "mapViolationsToJson", String.class, Set.class, HttpServerResponse.class); @@ -195,7 +195,7 @@ class Methods { RoutingContext.class.getName(), Boolean.TYPE.getName()); static final MethodDescriptor VALIDATOR_VALIDATE = MethodDescriptor - .ofMethod("javax.validation.Validator", "validate", "java.util.Set", + .ofMethod("jakarta.validation.Validator", "validate", "java.util.Set", Object.class, Class[].class); static final MethodDescriptor SET_IS_EMPTY = MethodDescriptor.ofMethod(Set.class, "isEmpty", Boolean.TYPE); diff --git a/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java b/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java index 92a81c633f4be..56787171c3742 100644 --- a/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java +++ b/extensions/reactive-routes/deployment/src/main/java/io/quarkus/vertx/web/deployment/ReactiveRoutesProcessor.java @@ -32,10 +32,10 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.spi.Contextual; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.spi.Contextual; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java index bc85f76c62c87..37977b25baeff 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/ConflictingRouteTest.java @@ -2,7 +2,7 @@ import static io.restassured.RestAssured.get; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java index c7dab49919b1e..dfa393676cbc5 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/DependentRouteTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/LazyAuthRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/LazyAuthRouteTest.java index 6d261ad225c96..44bc25cbafef6 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/LazyAuthRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/LazyAuthRouteTest.java @@ -3,9 +3,9 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java index 5ae3a5cd56108..b6bd6cbad75dc 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java @@ -10,10 +10,10 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java index 0631a1e899ad7..12e877a7cd604 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java @@ -3,7 +3,7 @@ import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.containsString; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/compress/CompressionTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/compress/CompressionTest.java index 105ed6598c499..ddc1249b202b7 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/compress/CompressionTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/compress/CompressionTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/context/DuplicatedContextTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/context/DuplicatedContextTest.java index a7ef899529589..71545b5912778 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/context/DuplicatedContextTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/context/DuplicatedContextTest.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/AuthCompletionExceptionHandlerTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/AuthCompletionExceptionHandlerTest.java index 69cf3f634098f..c056236b07682 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/AuthCompletionExceptionHandlerTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/failure/AuthCompletionExceptionHandlerTest.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.web.failure; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import java.util.function.Supplier; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java index 233731b1a9f35..32f4851957c3f 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java @@ -4,8 +4,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java index bc8baeac2f577..493e52f4961b7 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java index 1f93be9ee97b7..82d66e4abb4e9 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java @@ -5,9 +5,9 @@ import java.net.URL; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.stream.JsonParser; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.stream.JsonParser; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java index ff91979871583..0a7e6a523413d 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/reactive/RequestContextPropagationTest.java @@ -10,10 +10,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java index 67a019d31280b..5a29bc5a147ff 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java @@ -4,9 +4,9 @@ import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.Matchers.emptyString; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java index 7db7591dee42f..7d49f31d1c631 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java @@ -8,10 +8,10 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.Matchers.emptyString; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java index 97d7949a4942c..7ca22f2527ada 100644 --- a/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java +++ b/extensions/reactive-routes/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java @@ -8,10 +8,10 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.Matchers.emptyString; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiJsonArraySupport.java b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiJsonArraySupport.java index 38417f89b7ad0..f7da1f6d3e4ae 100644 --- a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiJsonArraySupport.java +++ b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiJsonArraySupport.java @@ -1,10 +1,9 @@ package io.quarkus.vertx.web.runtime; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Subscriber; import java.util.function.Function; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - import io.smallrye.mutiny.Multi; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -37,10 +36,10 @@ public Buffer apply(String s) { private static void write(Multi multi, RoutingContext rc) { HttpServerResponse response = rc.response(); multi.subscribe().withSubscriber(new Subscriber() { - Subscription upstream; + Flow.Subscription upstream; @Override - public void onSubscribe(Subscription subscription) { + public void onSubscribe(Flow.Subscription subscription) { this.upstream = subscription; this.upstream.request(1); } @@ -78,7 +77,7 @@ public void onComplete() { }); } - private static void onWriteDone(Subscription subscription, AsyncResult ar, RoutingContext rc) { + private static void onWriteDone(Flow.Subscription subscription, AsyncResult ar, RoutingContext rc) { if (ar.failed()) { rc.fail(ar.cause()); } else { diff --git a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiNdjsonSupport.java b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiNdjsonSupport.java index 4d7da7b2fc5c8..907ea871ae112 100644 --- a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiNdjsonSupport.java +++ b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiNdjsonSupport.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.web.runtime; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import io.smallrye.mutiny.Multi; import io.vertx.core.AsyncResult; diff --git a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java index 11962e9bdd75c..1c3c323628760 100644 --- a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java +++ b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java @@ -1,11 +1,10 @@ package io.quarkus.vertx.web.runtime; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - import io.quarkus.vertx.web.ReactiveRoutes; import io.smallrye.mutiny.Multi; import io.vertx.core.AsyncResult; @@ -52,7 +51,7 @@ private static void onWriteDone(Subscription subscription, AsyncResult ar, public static void write(Multi multi, RoutingContext rc) { HttpServerResponse response = rc.response(); - multi.subscribe().withSubscriber(new Subscriber() { + multi.subscribe().withSubscriber(new Flow.Subscriber() { Subscription upstream; @Override @@ -86,7 +85,7 @@ public void onComplete() { public static void subscribeBuffer(Multi multi, RoutingContext rc) { HttpServerResponse response = rc.response(); - multi.subscribe().withSubscriber(new Subscriber() { + multi.subscribe().withSubscriber(new Flow.Subscriber() { Subscription upstream; final AtomicLong count = new AtomicLong(); diff --git a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java index 58634cd62469f..efde297927100 100644 --- a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java +++ b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java @@ -1,11 +1,10 @@ package io.quarkus.vertx.web.runtime; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.function.Consumer; import java.util.function.Function; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; - import io.smallrye.mutiny.Multi; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java index 5f37c77cfe019..205897d336795 100644 --- a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java +++ b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.web.runtime; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableContext.ContextState; diff --git a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java index c989604313cd0..25755f5595113 100644 --- a/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java +++ b/extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java @@ -3,11 +3,11 @@ import java.util.Iterator; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ElementKind; -import javax.validation.Path.Node; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ElementKind; +import jakarta.validation.Path.Node; +import jakarta.validation.Validator; import io.quarkus.arc.ArcContainer; import io.vertx.core.http.HttpServerResponse; diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/MyTestResource.java b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/MyTestResource.java index b45614cf0b347..318b842ebc6f4 100644 --- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/MyTestResource.java +++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/MyTestResource.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java index 8b92b641b0209..77d5900d1e9d7 100644 --- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java +++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/test/java/io/quarkus/mutiny/reactive/operators/deployment/ReactiveStreamsOperatorsUsageTest.java @@ -5,8 +5,8 @@ import java.util.List; 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.reactive.streams.operators.ReactiveStreams; import org.junit.jupiter.api.Test; diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/MyTestResource.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/MyTestResource.java index 57469a0315ed6..0458b7afdccbc 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/MyTestResource.java +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/MyTestResource.java @@ -3,8 +3,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java index ae942ebf21e30..b1f12defaa9ba 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/test/java/io/quarkus/smallrye/reactivestreamoperators/deployment/ReactiveStreamsOperatorsUsageTest.java @@ -5,8 +5,8 @@ import java.util.List; 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.reactive.streams.operators.ReactiveStreams; import org.junit.jupiter.api.Test; diff --git a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java index 338fe81be1dfe..f745b7079eb88 100644 --- a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java +++ b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java @@ -16,8 +16,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/ClientInjectionTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/ClientInjectionTest.java index f6f1abf40fd43..8c535793a23b8 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/ClientInjectionTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/ClientInjectionTest.java @@ -1,6 +1,6 @@ package io.quarkus.redis.client.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/CustomizerTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/CustomizerTest.java index 7b972edba2d92..36cc8fd857573 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/CustomizerTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/CustomizerTest.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/RedisNoConfTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/RedisNoConfTest.java index 210513b5e1264..82f6461e25939 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/RedisNoConfTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/RedisNoConfTest.java @@ -1,8 +1,8 @@ package io.quarkus.redis.client.deployment; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceInjectionTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceInjectionTest.java index 5836d90e79140..621fb5f254ee1 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceInjectionTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceInjectionTest.java @@ -2,8 +2,8 @@ import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceTest.java index 9e287e844a07e..ec58e9b304fa5 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/datasource/DataSourceTest.java @@ -1,6 +1,6 @@ package io.quarkus.redis.client.deployment.datasource; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/devmode/IncrementResource.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/devmode/IncrementResource.java index 29b8dd7701486..20727dd2d95eb 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/devmode/IncrementResource.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/devmode/IncrementResource.java @@ -1,7 +1,7 @@ package io.quarkus.redis.client.deployment.devmode; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.redis.datasource.RedisDataSource; import io.quarkus.redis.datasource.keys.KeyCommands; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/BinaryTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/BinaryTest.java index 9d61ed060c9bf..af6e25caa4c92 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/BinaryTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/BinaryTest.java @@ -3,8 +3,8 @@ import java.util.NoSuchElementException; import java.util.Random; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CacheTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CacheTest.java index 45df0bb42fd93..3e116d118feeb 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CacheTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CacheTest.java @@ -2,8 +2,8 @@ import static org.awaitility.Awaitility.await; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CounterTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CounterTest.java index a5b8332d98810..0757a70b00b2b 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CounterTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/CounterTest.java @@ -1,7 +1,7 @@ package io.quarkus.redis.client.deployment.patterns; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubOnStartupTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubOnStartupTest.java index 5402b3ebee389..f4ce1faf44868 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubOnStartupTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubOnStartupTest.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.function.Consumer; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubTest.java index 2fd74d7e7d427..37dc206e81b78 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/patterns/PubSubTest.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.function.Consumer; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/DefaultFileForDefaultClientPreloadingTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/DefaultFileForDefaultClientPreloadingTest.java index fa1af0e10f7c3..87c1f523303ae 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/DefaultFileForDefaultClientPreloadingTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/DefaultFileForDefaultClientPreloadingTest.java @@ -5,7 +5,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MissingFilePreloadTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MissingFilePreloadTest.java index 027c28f9ffa07..3bcc40a11feae 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MissingFilePreloadTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MissingFilePreloadTest.java @@ -4,7 +4,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingTest.java index 951945a866cd4..5124edfe61bcb 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingTest.java @@ -5,7 +5,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithFlushAllTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithFlushAllTest.java index f9e3277d59c38..cb50a71dbe7df 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithFlushAllTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithFlushAllTest.java @@ -4,7 +4,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithOnlyIfEmptyTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithOnlyIfEmptyTest.java index 4994e82603c45..313a6d6b087c7 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithOnlyIfEmptyTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultiClientImportPreloadingWithOnlyIfEmptyTest.java @@ -4,7 +4,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultipleFilesForDefaultClientImportPreloadingTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultipleFilesForDefaultClientImportPreloadingTest.java index 0cb0388fafc3b..15e6247fe1474 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultipleFilesForDefaultClientImportPreloadingTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/MultipleFilesForDefaultClientImportPreloadingTest.java @@ -5,7 +5,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/NonDefaultFileForDefaultClientImportPreloadingTest.java b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/NonDefaultFileForDefaultClientImportPreloadingTest.java index 50e92df940138..1deebc7ca644c 100644 --- a/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/NonDefaultFileForDefaultClientImportPreloadingTest.java +++ b/extensions/redis-client/deployment/src/test/java/io/quarkus/redis/client/deployment/preloading/NonDefaultFileForDefaultClientImportPreloadingTest.java @@ -5,7 +5,7 @@ import java.io.File; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/redis-client/runtime/src/etc/RedisCommandGenerator.java b/extensions/redis-client/runtime/src/etc/RedisCommandGenerator.java old mode 100755 new mode 100644 diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java index c6fb47e7a2ce4..45d8f0bcc41b8 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Marker annotation to select the Redis client. diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/RedisClientRecorder.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/RedisClientRecorder.java index fcb1abfbc654c..a649952c0f322 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/RedisClientRecorder.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/RedisClientRecorder.java @@ -10,8 +10,8 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import io.quarkus.redis.client.RedisClient; import io.quarkus.redis.client.reactive.ReactiveRedisClient; diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/health/RedisHealthCheck.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/health/RedisHealthCheck.java index 5a64eb1d2ffb6..2a986c6aa8a6a 100644 --- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/health/RedisHealthCheck.java +++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/runtime/client/health/RedisHealthCheck.java @@ -6,10 +6,10 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.Bean; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.Bean; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientConfig.java b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientConfig.java index 881a3fd2cef2d..e9d1bf22249fe 100644 --- a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientConfig.java +++ b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientConfig.java @@ -64,7 +64,7 @@ public class RestClientConfig { /** * The CDI scope to use for injection. This property can contain either a fully qualified class name of a CDI scope - * annotation (such as "javax.enterprise.context.ApplicationScoped") or its simple name (such as + * annotation (such as "jakarta.enterprise.context.ApplicationScoped") or its simple name (such as * "ApplicationScoped"). */ @ConfigItem diff --git a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java index cd400ada1b8cf..59e7646849ffd 100644 --- a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java +++ b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.inject.CreationException; +import jakarta.enterprise.inject.CreationException; import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; @@ -197,7 +197,8 @@ public class RestClientsConfig { /** * The CDI scope to use for injections of REST client instances. Value can be either a fully qualified class name of a CDI - * scope annotation (such as "javax.enterprise.context.ApplicationScoped") or its simple name (such as"ApplicationScoped"). + * scope annotation (such as "jakarta.enterprise.context.ApplicationScoped") or its simple name (such + * as"ApplicationScoped"). * * Default scope for the rest-client extension is "Dependent" (which is the spec-compliant behavior). * diff --git a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ClientResource.java b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ClientResource.java index f107c8d39c2ce..b9271f33159c3 100644 --- a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ClientResource.java +++ b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ClientResource.java @@ -4,9 +4,9 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java index 9cf541b844927..d114386918989 100644 --- a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java +++ b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java @@ -3,9 +3,9 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -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 com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java index 7a367ebe3f6ca..263aadaab6349 100644 --- a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java +++ b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java @@ -1,7 +1,7 @@ package io.quarkus.restclient.jackson.deployment; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java index 8c0ba48a63e7f..950ecc5c60c96 100644 --- a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java +++ b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java @@ -5,7 +5,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatterBuilder; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/extensions/resteasy-classic/rest-client-jackson/runtime/pom.xml b/extensions/resteasy-classic/rest-client-jackson/runtime/pom.xml index c8eeb1847d006..9208f6581a8b0 100644 --- a/extensions/resteasy-classic/rest-client-jackson/runtime/pom.xml +++ b/extensions/resteasy-classic/rest-client-jackson/runtime/pom.xml @@ -40,8 +40,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/Book.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/Book.java index ac32ad10ed93c..9fb22cd55b296 100644 --- a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/Book.java +++ b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/Book.java @@ -1,6 +1,6 @@ package io.quarkus.restclient.jaxb.deployment; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Book { diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/ClientResource.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/ClientResource.java index 02f20ddb1df7f..7bb568000fc6b 100644 --- a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/ClientResource.java +++ b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/ClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.restclient.jaxb.deployment; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/HelloResource.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/HelloResource.java index cd54bc7b65a66..27eb4791a64fb 100644 --- a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/HelloResource.java +++ b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/HelloResource.java @@ -1,9 +1,9 @@ package io.quarkus.restclient.jaxb.deployment; -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("/hello") diff --git a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/RestInterface.java b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/RestInterface.java index f985b39eebe5e..c388efc70648c 100644 --- a/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/RestInterface.java +++ b/extensions/resteasy-classic/rest-client-jaxb/deployment/src/test/java/io/quarkus/restclient/jaxb/deployment/RestInterface.java @@ -1,9 +1,9 @@ package io.quarkus.restclient.jaxb.deployment; -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/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml b/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml index 73fb21cdfd546..0cceee986a1aa 100644 --- a/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml +++ b/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml @@ -32,12 +32,12 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ClientResource.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ClientResource.java index 1158b89e0c5f6..6c8c7e99a720a 100644 --- a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ClientResource.java +++ b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ClientResource.java @@ -4,9 +4,9 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java index af8a4781a7b8c..f88033da9222b 100644 --- a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java +++ b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java @@ -2,10 +2,10 @@ import java.time.ZonedDateTime; -import javax.inject.Inject; -import javax.json.bind.Jsonb; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.json.bind.Jsonb; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello") public class HelloResource { diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java index a20c3fab7d045..ed1abe12fa987 100644 --- a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java +++ b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java @@ -1,7 +1,7 @@ package io.quarkus.restclient.jsonb.deployment; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ZonedDateTimeJsonbConfigCustomizer.java b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ZonedDateTimeJsonbConfigCustomizer.java index 12bcd9c99ec52..ecbe7b992b65b 100644 --- a/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ZonedDateTimeJsonbConfigCustomizer.java +++ b/extensions/resteasy-classic/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/ZonedDateTimeJsonbConfigCustomizer.java @@ -4,11 +4,11 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -import javax.inject.Singleton; -import javax.json.bind.JsonbConfig; -import javax.json.bind.serializer.DeserializationContext; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.stream.JsonParser; +import jakarta.inject.Singleton; +import jakarta.json.bind.JsonbConfig; +import jakarta.json.bind.serializer.DeserializationContext; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.stream.JsonParser; import io.quarkus.jsonb.JsonbConfigCustomizer; diff --git a/extensions/resteasy-classic/rest-client-jsonb/runtime/pom.xml b/extensions/resteasy-classic/rest-client-jsonb/runtime/pom.xml index 200bd4df61062..a8d63905c7729 100644 --- a/extensions/resteasy-classic/rest-client-jsonb/runtime/pom.xml +++ b/extensions/resteasy-classic/rest-client-jsonb/runtime/pom.xml @@ -26,7 +26,6 @@ org.jboss.resteasy resteasy-json-binding-provider - org.glassfish jakarta.json diff --git a/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java b/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java index 97870bc3dda55..1454b19ea33e1 100644 --- a/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java +++ b/extensions/resteasy-classic/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java @@ -5,8 +5,8 @@ import java.net.URL; import java.util.concurrent.ExecutionException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java b/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java index 42fc7d921fc62..06e7288aa1898 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java @@ -13,12 +13,12 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.spi.InterceptionType; -import javax.ws.rs.Path; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.ext.Providers; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.ext.Providers; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; @@ -117,13 +117,13 @@ class RestClientProcessor { void setupProviders(BuildProducer resources, BuildProducer proxyDefinition) { - proxyDefinition.produce(new NativeImageProxyDefinitionBuildItem("javax.ws.rs.ext.Providers")); + proxyDefinition.produce(new NativeImageProxyDefinitionBuildItem("jakarta.ws.rs.ext.Providers")); resources.produce(new NativeImageResourceBuildItem(PROVIDERS_SERVICE_FILE)); } @BuildStep void setupClientBuilder(BuildProducer resources) { - resources.produce(new NativeImageResourceBuildItem("META-INF/services/javax.ws.rs.client.ClientBuilder")); + resources.produce(new NativeImageResourceBuildItem("META-INF/services/jakarta.ws.rs.client.ClientBuilder")); } @BuildStep @@ -164,7 +164,7 @@ void setup(BuildProducer feature, ProxyBuilderImpl.class.getName(), ClientRequestFilter[].class.getName(), ClientResponseFilter[].class.getName(), - javax.ws.rs.ext.ReaderInterceptor[].class.getName())); + jakarta.ws.rs.ext.ReaderInterceptor[].class.getName())); reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, ResteasyClientBuilder.class.getName(), NoopHostnameVerifier.class.getName())); diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClient.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClient.java index 48e68fdf3ad9e..d643bffe2a3c1 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClient.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClient.java @@ -1,11 +1,11 @@ package io.quarkus.restclient.configuration; -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.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithConfigKey.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithConfigKey.java index 5f970adfc2225..734adbf26e184 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithConfigKey.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithConfigKey.java @@ -1,11 +1,11 @@ package io.quarkus.restclient.configuration; -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.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithoutAnnotation.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithoutAnnotation.java index f27d86054b4f6..bdf5f27d43998 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithoutAnnotation.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoClientWithoutAnnotation.java @@ -1,11 +1,11 @@ package io.quarkus.restclient.configuration; -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; @Path("/echo") public interface EchoClientWithoutAnnotation { diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoResource.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoResource.java index f67485e7606fe..e3b941d1d6961 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoResource.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/EchoResource.java @@ -1,11 +1,11 @@ package io.quarkus.restclient.configuration; -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; @Path("/echo") public class EchoResource { diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java index 6011647928af1..44578ef9538e7 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/GlobalConfigurationTest.java @@ -5,10 +5,10 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java index ca19c8d2163b5..fd3dc57f49cbb 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MPRestClientsTest.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MyResponseFilter.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MyResponseFilter.java index d465c01d9f783..8a775d826cebb 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MyResponseFilter.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/MyResponseFilter.java @@ -1,8 +1,8 @@ package io.quarkus.restclient.configuration; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; public class MyResponseFilter implements ClientResponseFilter { @Override diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java index 8295269d7a971..8927496bdc37a 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusConfigurationTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java index 2feece9c9dc3a..676e6d95ed01b 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/QuarkusRestClientsTest.java @@ -1,6 +1,6 @@ package io.quarkus.restclient.configuration; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java index 24f9e150914c5..9d6672277432e 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java @@ -7,7 +7,7 @@ import java.util.Optional; import java.util.stream.StreamSupport; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/ShortNameEchoClient.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/ShortNameEchoClient.java index f08b21ec712ec..a3fca41e87c68 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/ShortNameEchoClient.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/ShortNameEchoClient.java @@ -1,11 +1,11 @@ package io.quarkus.restclient.configuration; -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.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/UnknownConfigTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/UnknownConfigTest.java index c9508191bb34c..430b7e713a5ff 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/UnknownConfigTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/UnknownConfigTest.java @@ -7,7 +7,7 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/VaultScenarioRestClientConfigTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/VaultScenarioRestClientConfigTest.java index 52508979e6560..5a4e7ace7831b 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/VaultScenarioRestClientConfigTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/configuration/VaultScenarioRestClientConfigTest.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java index 5130947b02150..1fb6866b26983 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java @@ -1,6 +1,6 @@ package io.quarkus.restclient.exception; -import javax.ws.rs.GET; +import jakarta.ws.rs.GET; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java index 9055fe3129356..8bb8f5fe2efea 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java @@ -2,10 +2,10 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.RedirectionException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.RedirectionException; +import jakarta.ws.rs.core.Response; @Path("/downstream") public class DownstreamServiceRedirectEndpoint { diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java index e0f532172bf6d..40bafe489a61d 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.restclient.exception; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; @Path("/downstream") public class DownstreamServiceUnavailableEndpoint { diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java index 2b67e730e55db..6c91fcda20781 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java @@ -1,9 +1,9 @@ package io.quarkus.restclient.exception; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java index 771424be233bd..50e17bb237089 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java @@ -7,8 +7,8 @@ import java.net.URL; import java.util.Properties; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java index 440be6aa8f901..91ba31acf77d3 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java @@ -5,8 +5,8 @@ import java.net.URL; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java index f5b84e4b53a40..52a8821b935e8 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/AsyncRestClientFallbackTest.java @@ -7,9 +7,9 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.ExecutionContext; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java index c5deda240356d..bad12de7a04d3 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java @@ -4,9 +4,9 @@ import java.net.URL; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.faulttolerance.ExecutionContext; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java index 527b26229c2cf..504dcb0f62807 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/interceptor/RestClientInterceptorTest.java @@ -10,14 +10,14 @@ import java.lang.annotation.Target; import java.net.URL; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java index 37ace0002b57f..d4a68c43e65ef 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java @@ -1,11 +1,11 @@ package io.quarkus.restclient.registerclientheaders; -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.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java index ec7aa4476789a..4998eaf6e7f70 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java @@ -1,12 +1,12 @@ package io.quarkus.restclient.registerclientheaders; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.HeaderParam; +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.rest.client.inject.RestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java index 08fce91855ae6..ea18b17495e97 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoClient.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoClient.java index 9fa3bc8921a6f..730ff17034c57 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoClient.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoClient.java @@ -2,12 +2,12 @@ import java.util.concurrent.CompletionStage; -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.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoResource.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoResource.java index 3ea11e1563826..7b810558f0cc4 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoResource.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/EchoResource.java @@ -3,13 +3,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -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.inject.Inject; +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.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.core.ResteasyContext; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MethodsCollector.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MethodsCollector.java index f56d1a1b5fe90..1dfacfbce8779 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MethodsCollector.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MethodsCollector.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class MethodsCollector { diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyFilter.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyFilter.java index 37d086b170b50..2d3248d7ca965 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyFilter.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.inject.Inject; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import org.jboss.resteasy.core.ResteasyContext; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyRequestBean.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyRequestBean.java index 2f7a66cc42898..2406bda4859c2 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyRequestBean.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/MyRequestBean.java @@ -1,6 +1,6 @@ package io.quarkus.restclient.registerprovider; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class MyRequestBean { diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java index fa65edd513e12..9e972de2d593d 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java @@ -4,20 +4,20 @@ import java.net.InetSocketAddress; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.specimpl.ResteasyUriInfo; import org.junit.jupiter.api.AfterAll; diff --git a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java index 3e00dbd3da8e1..8bdf7b1fd1131 100644 --- a/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java +++ b/extensions/resteasy-classic/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/RegisterProviderTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/rest-client/runtime/pom.xml b/extensions/resteasy-classic/rest-client/runtime/pom.xml index 5ce4a733fe953..2fbf536881bc5 100644 --- a/extensions/resteasy-classic/rest-client/runtime/pom.xml +++ b/extensions/resteasy-classic/rest-client/runtime/pom.xml @@ -35,8 +35,8 @@ quarkus-rest-client-config - org.jboss.resteasy - resteasy-client-microprofile + org.jboss.resteasy.microprofile + microprofile-rest-client org.jboss.spec.javax.interceptor @@ -62,6 +62,10 @@ jakarta.interceptor jakarta.interceptor-api + + jakarta.ws.rs + jakarta.ws.rs-api + org.apache.httpcomponents httpasyncclient diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathFeatureHandler.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathFeatureHandler.java index e9df28a93dbee..f2ff32537b8a4 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathFeatureHandler.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathFeatureHandler.java @@ -3,12 +3,12 @@ import java.lang.reflect.Method; import java.util.regex.Pattern; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.Path; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; /** * feature that set's the URLConfig diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathTemplateInjectionFilter.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathTemplateInjectionFilter.java index 9c98c2a5ca08e..d3881117141af 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathTemplateInjectionFilter.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/PathTemplateInjectionFilter.java @@ -1,8 +1,8 @@ package io.quarkus.restclient.runtime; -import javax.annotation.Priority; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; @Priority(Integer.MIN_VALUE) public class PathTemplateInjectionFilter implements ClientRequestFilter { diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java index d96ca2680894c..f8cbe8ee6bcb5 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/QuarkusRestClientBuilder.java @@ -23,7 +23,9 @@ import java.security.NoSuchAlgorithmException; import java.security.PrivilegedAction; import java.security.SecureRandom; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -31,22 +33,22 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; -import javax.ws.rs.BeanParam; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ParamConverterProvider; + +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; @@ -58,11 +60,14 @@ import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.logging.Logger; +import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.engines.PassthroughTrustManager; import org.jboss.resteasy.client.jaxrs.engines.URLConnectionClientEngineBuilder; import org.jboss.resteasy.client.jaxrs.internal.LocalResteasyProviderFactory; +import org.jboss.resteasy.concurrent.ContextualExecutorService; +import org.jboss.resteasy.concurrent.ContextualExecutors; import org.jboss.resteasy.microprofile.client.ConfigurationWrapper; import org.jboss.resteasy.microprofile.client.DefaultMediaTypeFilter; import org.jboss.resteasy.microprofile.client.DefaultResponseExceptionMapper; @@ -72,6 +77,7 @@ import org.jboss.resteasy.microprofile.client.RestClientListeners; import org.jboss.resteasy.microprofile.client.RestClientProxy; import org.jboss.resteasy.microprofile.client.async.AsyncInterceptorRxInvokerProvider; +import org.jboss.resteasy.microprofile.client.async.AsyncInvocationInterceptorThreadContext; import org.jboss.resteasy.microprofile.client.header.ClientHeaderProviders; import org.jboss.resteasy.microprofile.client.header.ClientHeadersRequestFilter; import org.jboss.resteasy.microprofile.client.impl.MpClient; @@ -87,11 +93,8 @@ import io.quarkus.runtime.graal.DisabledSSLContext; import io.quarkus.runtime.ssl.SslContextConfiguration; -/** - * This is mostly a copy from {@link org.jboss.resteasy.microprofile.client.RestClientBuilderImpl}. It is required to - * remove the reference to org.jboss.resteasy.cdi.CdiInjectorFactory so we don't require the RESTEasy CDI dependency. - */ public class QuarkusRestClientBuilder implements RestClientBuilder { + private static final String RESTEASY_PROPERTY_PREFIX = "resteasy."; private static final String DEFAULT_MAPPER_PROP = "microprofile.rest.client.disable.default.mapper"; @@ -225,13 +228,12 @@ public RestClientBuilder executorService(ExecutorService executor) { if (executor == null) { throw new IllegalArgumentException("ExecutorService must not be null"); } - executorService = executor; + executorService = ContextualExecutors.wrap(executor); return this; } - @SuppressWarnings("unchecked") - @Override - public T build(Class aClass) throws IllegalStateException, RestClientDefinitionException { + public T build(Class aClass, ClientHttpEngine httpEngine) + throws IllegalStateException, RestClientDefinitionException { RestClientListeners.get().forEach(listener -> listener.onNewClient(aClass, this)); @@ -288,10 +290,9 @@ public T build(Class aClass) throws IllegalStateException, RestClientDefi if (this.executorService != null) { resteasyClientBuilder.executorService(this.executorService); } else { - this.executorService = Executors.newCachedThreadPool(); - resteasyClientBuilder.executorService(executorService, true); + this.executorService = ContextualExecutors.threadPool(); + resteasyClientBuilder.executorService(executorService, !executorService.isManaged()); } - resteasyClientBuilder.register(DEFAULT_MEDIA_TYPE_FILTER); resteasyClientBuilder.register(METHOD_INJECTION_FILTER); resteasyClientBuilder.register(HEADERS_REQUEST_FILTER); @@ -313,12 +314,25 @@ public T build(Class aClass) throws IllegalStateException, RestClientDefi resteasyClientBuilder.connectTimeout(connectTimeout, connectTimeoutUnit); } - if (useURLConnection()) { - resteasyClientBuilder - .httpEngine(new URLConnectionClientEngineBuilder().resteasyClientBuilder(resteasyClientBuilder).build()); - resteasyClientBuilder.sslContext(null); - resteasyClientBuilder.trustStore(null); - resteasyClientBuilder.keyStore(null, ""); + if (httpEngine != null) { + resteasyClientBuilder.httpEngine(httpEngine); + } else { + boolean registerEngine = false; + for (Object p : getBuilderDelegate().getProviderFactory().getProviderInstances()) { + if (p instanceof ClientHttpEngine) { + resteasyClientBuilder.httpEngine((ClientHttpEngine) p); + registerEngine = true; + break; + } + } + if (!registerEngine && useURLConnection()) { + resteasyClientBuilder + .httpEngine(new URLConnectionClientEngineBuilder().resteasyClientBuilder(resteasyClientBuilder) + .build()); + resteasyClientBuilder.sslContext(null); + resteasyClientBuilder.trustStore(null); + resteasyClientBuilder.keyStore(null, ""); + } } configureTrustAll(resteasyClientBuilder); @@ -328,6 +342,10 @@ public T build(Class aClass) throws IllegalStateException, RestClientDefi resteasyClientBuilder.sslContext(new DisabledSSLContext()); } + if (!invocationInterceptorFactories.isEmpty()) { + resteasyClientBuilder.register(new AsyncInvocationInterceptorThreadContext(invocationInterceptorFactories)); + } + client = resteasyClientBuilder .build(); ((MpClient) client).setQueryParamStyle(queryParamStyle); @@ -343,9 +361,10 @@ public T build(Class aClass) throws IllegalStateException, RestClientDefi interfaces[1] = RestClientProxy.class; interfaces[2] = Closeable.class; + final BeanManager beanManager = getBeanManager(); T proxy = (T) Proxy.newProxyInstance(classLoader, interfaces, - new ProxyInvocationHandler(aClass, actualClient, getLocalProviderInstances(), client, getBeanManager())); - ClientHeaderProviders.registerForClass(aClass, proxy, getBeanManager()); + new ProxyInvocationHandler(aClass, actualClient, getLocalProviderInstances(), client, beanManager)); + ClientHeaderProviders.registerForClass(aClass, proxy, beanManager); return proxy; } @@ -367,8 +386,30 @@ private void configureTrustAll(ResteasyClientBuilder clientBuilder) { } } + @SuppressWarnings("unchecked") + @Override + public T build(Class aClass) throws IllegalStateException, RestClientDefinitionException { + return build(aClass, null); + } + + /** + * Get the users list of proxy hosts. Translate list to regex format + * + * @return list of proxy hosts + */ + private List getProxyHostsAsRegex() { + String noProxyHostsSysProps = getSystemProperty("http.nonProxyHosts", null); + if (noProxyHostsSysProps == null) { + noProxyHostsSysProps = "localhost|127.*|[::1]"; + } else { + String src2 = noProxyHostsSysProps.replace(".", "\\."); + noProxyHostsSysProps = src2.replace("*", "[A-Za-z0-9-]*"); + } + return Arrays.asList(noProxyHostsSysProps.split("\\|")); + } + /** - * Determines whether to default to using the URLConnection instead of the Apache HTTP Client. + * Determines whether or not to default to using the URLConnection instead of the Apache HTTP Client. * If the {@code org.jboss.resteasy.microprofile.defaultToURLConnectionHttpClient} system property is {@code true}, * then this method returns {@code true}. In all other cases it returns {@code false} */ @@ -376,7 +417,7 @@ private boolean useURLConnection() { if (useURLConnection == null) { String defaultToURLConnection = getSystemProperty( "org.jboss.resteasy.microprofile.defaultToURLConnectionHttpClient", "false"); - useURLConnection = defaultToURLConnection.toLowerCase().equals("true"); + useURLConnection = defaultToURLConnection.equalsIgnoreCase("true"); } return useURLConnection; } @@ -389,7 +430,7 @@ private Optional selectHttpProxy() { .findFirst(); } - private void checkQueryParamStyleProperty(Class aClass) { + private void checkQueryParamStyleProperty(Class aClass) { // User's programmatic setting takes precedence over // microprofile-config.properties. if (queryParamStyle == null) { @@ -402,7 +443,7 @@ private void checkQueryParamStyleProperty(Class aClass) { prop.get().trim().toUpperCase())); } else { - RegisterRestClient registerRestClient = (RegisterRestClient) aClass.getAnnotation(RegisterRestClient.class); + RegisterRestClient registerRestClient = aClass.getAnnotation(RegisterRestClient.class); if (registerRestClient != null && registerRestClient.configKey() != null && !registerRestClient.configKey().isEmpty()) { @@ -423,7 +464,7 @@ private void checkQueryParamStyleProperty(Class aClass) { } } - private void checkFollowRedirectProperty(Class aClass) { + private void checkFollowRedirectProperty(Class aClass) { // User's programmatic setting takes precedence over // microprofile-config.properties. if (!followRedirect) { @@ -436,7 +477,7 @@ private void checkFollowRedirectProperty(Class aClass) { followRedirects(prop.get()); } } else { - RegisterRestClient registerRestClient = (RegisterRestClient) aClass.getAnnotation(RegisterRestClient.class); + RegisterRestClient registerRestClient = aClass.getAnnotation(RegisterRestClient.class); if (registerRestClient != null && registerRestClient.configKey() != null && !registerRestClient.configKey().isEmpty()) { @@ -552,6 +593,8 @@ private void verifyInterface(Class typeDef) { .uri(classPathAnno.value() + "/" + methodPathAnno.value()); } else if (classPathAnno != null) { template = (ResteasyUriBuilder) new ResteasyUriBuilderImpl().uri(classPathAnno.value()); + } else { + template = null; } if (template == null) { @@ -570,8 +613,8 @@ private void verifyInterface(Class typeDef) { } else if (p.isAnnotationPresent(org.jboss.resteasy.annotations.jaxrs.PathParam.class)) { org.jboss.resteasy.annotations.jaxrs.PathParam rePathParam = p .getAnnotation(org.jboss.resteasy.annotations.jaxrs.PathParam.class); - String name = rePathParam.value() == null || rePathParam.value().length() == 0 ? p.getName() - : rePathParam.value(); + String name = rePathParam.value() == null || rePathParam.value() + .length() == 0 ? p.getName() : rePathParam.value(); paramMap.put(name, "foobar"); } else if (p.isAnnotationPresent(BeanParam.class)) { verifyBeanPathParam(p.getType(), paramMap); @@ -672,7 +715,7 @@ public RestClientBuilder register(Object o) { } else if (o instanceof ParamConverterProvider) { register(o, Priorities.USER); } else if (o instanceof AsyncInvocationInterceptorFactory) { - builderDelegate.asyncInterceptorFactories.add((AsyncInvocationInterceptorFactory) o); + invocationInterceptorFactories.add((AsyncInvocationInterceptorFactory) o); } else { builderDelegate.register(o); } @@ -704,7 +747,7 @@ public RestClientBuilder register(Object o, int i) { builderDelegate.register(converter, i); } else if (o instanceof AsyncInvocationInterceptorFactory) { - builderDelegate.asyncInterceptorFactories.add((AsyncInvocationInterceptorFactory) o); + invocationInterceptorFactories.add((AsyncInvocationInterceptorFactory) o); } else { builderDelegate.register(o, i); } @@ -790,7 +833,7 @@ private String getSystemProperty(String key, String def) { private Config config; - private ExecutorService executorService; + private ContextualExecutorService executorService; private URI baseURI; @@ -812,5 +855,6 @@ private String getSystemProperty(String key, String def) { private boolean followRedirect; private QueryParamStyle queryParamStyle = null; - private Set localProviderInstances = new HashSet<>(); + private final Set localProviderInstances = new HashSet<>(); + private final Collection invocationInterceptorFactories = new ArrayList<>(); } diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java index da136486a8cad..5340cbed4a158 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver; import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl; diff --git a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/graal/ClientBuilderReplacement.java b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/graal/ClientBuilderReplacement.java index 51e87f7a61055..4ad2856faa840 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/graal/ClientBuilderReplacement.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/graal/ClientBuilderReplacement.java @@ -1,6 +1,6 @@ package io.quarkus.restclient.runtime.graal; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientBuilder; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.internal.LocalResteasyProviderFactory; diff --git a/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java b/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java index de21cff73bb86..710c99fdb60fe 100644 --- a/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java +++ b/extensions/resteasy-classic/rest-client/runtime/src/test/java/io/quarkus/restclient/runtime/RestClientBaseTest.java @@ -15,9 +15,10 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; + +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; diff --git a/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java b/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java index 32575f5823f61..d8b1e60e26edc 100644 --- a/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java @@ -12,13 +12,13 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Providers; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; @@ -30,9 +30,9 @@ import org.jboss.jandex.Type; import org.jboss.logging.Logger; import org.jboss.resteasy.core.MediaTypeMap; -import org.jboss.resteasy.microprofile.config.FilterConfigSourceImpl; -import org.jboss.resteasy.microprofile.config.ServletConfigSourceImpl; -import org.jboss.resteasy.microprofile.config.ServletContextConfigSourceImpl; +import org.jboss.resteasy.microprofile.config.FilterConfigSource; +import org.jboss.resteasy.microprofile.config.ServletConfigSource; +import org.jboss.resteasy.microprofile.config.ServletContextConfigSource; import org.jboss.resteasy.plugins.interceptors.AcceptEncodingGZIPFilter; import org.jboss.resteasy.plugins.interceptors.GZIPDecodingInterceptor; import org.jboss.resteasy.plugins.interceptors.GZIPEncodingInterceptor; @@ -92,7 +92,7 @@ public class ResteasyCommonProcessor { private static final DotName QUARKUS_JSONB_CONTEXT_RESOLVER = DotName .createSimple("io.quarkus.resteasy.common.runtime.jsonb.QuarkusJsonbContextResolver"); - private static final DotName JSONB = DotName.createSimple("javax.json.bind.Jsonb"); + private static final DotName JSONB = DotName.createSimple("jakarta.json.bind.Jsonb"); private static final DotName QUARKUS_JSONB_SERIALIZER = DotName .createSimple("io.quarkus.resteasy.common.runtime.jsonb.QuarkusJsonbSerializer"); @@ -140,9 +140,9 @@ void addStaticInitConfigSourceProvider( staticInitConfigBuilder.produce(new StaticInitConfigBuilderBuildItem(ResteasyConfigBuilder.class)); reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, - ServletConfigSourceImpl.class, - ServletContextConfigSourceImpl.class, - FilterConfigSourceImpl.class)); + ServletConfigSource.class, + ServletContextConfigSource.class, + FilterConfigSource.class)); } @BuildStep diff --git a/extensions/resteasy-classic/resteasy-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-common/runtime/pom.xml index 804ca11a9af0a..3b5fcc8cfd91c 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-common/runtime/pom.xml @@ -41,8 +41,8 @@ quarkus-arc - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation com.fasterxml.jackson.core @@ -77,6 +77,14 @@ jakarta.json.bind-api true + + jakarta.ws.rs + jakarta.ws.rs-api + + + org.jboss.resteasy + resteasy-cdi + org.jboss.resteasy resteasy-json-binding-provider @@ -89,6 +97,10 @@ + + org.jboss.resteasy.microprofile + microprofile-config + @@ -101,7 +113,8 @@ javax.ws.rs:javax.ws.rs-api javax.activation:javax.activation-api javax.activation:activation - jakarta.ws.rs:jakarta.ws.rs-api + org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec + org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec org.jboss.resteasy:resteasy-context-propagation diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java index df4ac2bf252a9..9728268cb30d6 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusConstructorInjector.java @@ -3,7 +3,7 @@ import java.lang.reflect.Constructor; import java.util.function.Supplier; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; import org.jboss.resteasy.spi.ApplicationException; import org.jboss.resteasy.spi.ConstructorInjector; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java index 695c001f11b96..67c923e299653 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.Function; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; import org.jboss.logging.Logger; import org.jboss.resteasy.core.InjectorFactoryImpl; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/config/ThresholdConverter.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/config/ThresholdConverter.java new file mode 100644 index 0000000000000..3744afff1cf19 --- /dev/null +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/config/ThresholdConverter.java @@ -0,0 +1,70 @@ +package io.quarkus.resteasy.common.runtime.config; + +import static io.quarkus.runtime.configuration.ConverterSupport.DEFAULT_QUARKUS_CONVERTER_PRIORITY; + +import java.io.Serializable; +import java.time.Duration; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import jakarta.annotation.Priority; + +import org.eclipse.microprofile.config.spi.Converter; +import org.jboss.resteasy.spi.config.SizeUnit; +import org.jboss.resteasy.spi.config.Threshold; + +/** + * A converter for a {@link Threshold} interface. + */ +@Priority(DEFAULT_QUARKUS_CONVERTER_PRIORITY) +public class ThresholdConverter implements Converter, Serializable { + + public static final Threshold NONE = Threshold.of(-1L, SizeUnit.BYTE); + public static final Threshold DEFAULT = Threshold.of(512L, SizeUnit.KILOBYTE); + private static final Pattern PATTERN = Pattern.compile("(?-?(?!0)\\d+)\\s*(?(?:ZB|EB|TB|PB|GB|MB|KB|B)\\b)?"); + + public ThresholdConverter() { + } + + /** + * The converter accepts a value which start with a number by implicitly appending `PT` to it. + * If the value consists only of a number, it implicitly treats the value as seconds. + * Otherwise, tries to convert the value assuming that it is in the accepted ISO-8601 duration format. + * + * @param value duration as String + * @return {@link Duration} + */ + @Override + public Threshold convert(String value) { + value = value.trim(); + if (value.isEmpty()) { + return null; + } + + // The value should be something like 1 MB or 1MB + final Matcher matcher = PATTERN.matcher(value.toUpperCase(Locale.ROOT)); + if (!matcher.find()) { + return DEFAULT; + } + final String stringSize = matcher.group("size"); + final String stringUnit = matcher.group("unit"); + final long size; + if (stringSize == null || stringSize.isBlank()) { + return DEFAULT; + } else { + size = Long.parseLong(stringSize); + } + if (size < 0L) { + return NONE; + } + SizeUnit unit = null; + for (SizeUnit u : SizeUnit.values()) { + if (u.abbreviation().equals(stringUnit)) { + unit = u; + break; + } + } + return Threshold.of(size, unit == null ? SizeUnit.BYTE : unit); + } +} diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteDocumentProvider.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteDocumentProvider.java index 26f214eb2af0c..cf9674340af16 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteDocumentProvider.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteDocumentProvider.java @@ -6,10 +6,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.spi.ResteasyConfiguration; import org.w3c.dom.Document; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java index 208852004c11b..d66de43f6a436 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java @@ -9,9 +9,10 @@ import java.util.concurrent.CompletionStage; import javax.imageio.IIOImage; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.spi.AsyncOutputStream; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ServletMissing.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ServletMissing.java deleted file mode 100644 index 78dc0fd549dd2..0000000000000 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/ServletMissing.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.quarkus.resteasy.common.runtime.graal; - -import java.util.function.BooleanSupplier; - -/** - * Checks if servlet classes are available in the classpath and a suitable implementation. This is required because - * ConfigSource's provided by RESTEasy, need the servlet classes to function properly. If these classes are not found, - * we rewrite the sources to remove any references to the servlet classes and the internal RESTEasy sources in native - * mode. - * - * The offending RESTEasy sources are: - * {@link org.jboss.resteasy.microprofile.config.ServletConfigSource} - * {@link org.jboss.resteasy.microprofile.config.ServletContextConfigSource} - * {@link org.jboss.resteasy.microprofile.config.FilterConfigSource} - * - * The main instances sources are still part of the Config instance, but without the backing implementations, the source - * do not return any values. - * - * Ideally, this should be fixed in RESTEasy. - * - * See https://github.com/quarkusio/quarkus/issues/5492 - * See https://github.com/quarkusio/quarkus/issues/9086 - * See https://github.com/quarkusio/quarkus/issues/14876 - */ -public final class ServletMissing implements BooleanSupplier { - @Override - public boolean getAsBoolean() { - try { - Class.forName("javax.servlet.ServletConfig"); - Class.forName("javax.servlet.ServletContext"); - Class.forName("javax.servlet.FilterConfig"); - Class.forName("io.quarkus.undertow.runtime.UndertowDeploymentRecorder"); - return false; - } catch (ClassNotFoundException e) { - return true; - } - } -} diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java deleted file mode 100644 index e148e46d68700..0000000000000 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.quarkus.resteasy.common.runtime.graal; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; - -@TargetClass(className = "org.jboss.resteasy.microprofile.config.FilterConfigSource", onlyWith = { - ServletMissing.class -}) -final class Target_org_jboss_resteasy_microprofile_config_FilterConfigSource { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) - private static Class clazz; -} diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java deleted file mode 100644 index abc36c27bb6a2..0000000000000 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.quarkus.resteasy.common.runtime.graal; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; - -@TargetClass(className = "org.jboss.resteasy.microprofile.config.ServletConfigSource", onlyWith = { - ServletMissing.class -}) -final class Target_org_jboss_resteasy_microprofile_config_ServletConfigSource { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) - private static Class clazz; -} diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java deleted file mode 100644 index 56f58739cb109..0000000000000 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.quarkus.resteasy.common.runtime.graal; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; - -@TargetClass(className = "org.jboss.resteasy.microprofile.config.ServletContextConfigSource", onlyWith = { - ServletMissing.class -}) -final class Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) - private static Class clazz; - -} diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java index ec4b48899850b..f4667dcea7273 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java @@ -12,17 +12,17 @@ import java.util.Set; import java.util.concurrent.CompletionStage; -import javax.activation.DataSource; -import javax.annotation.Priority; -import javax.ws.rs.Consumes; -import javax.ws.rs.Priorities; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.ext.Provider; +import jakarta.activation.DataSource; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.plugins.providers.FileRange; import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java index 338831749d370..4cae4c3c70865 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusObjectMapperContextResolver.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.common.runtime.jackson; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java index 16b9412db5853..437f2f09359e1 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbContextResolver.java @@ -1,12 +1,12 @@ package io.quarkus.resteasy.common.runtime.jsonb; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.bind.Jsonb; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.bind.Jsonb; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; @Provider @ApplicationScoped diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java index c554e886eb59c..25a5eaff2ca7b 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java @@ -12,17 +12,17 @@ import java.util.Set; import java.util.concurrent.CompletionStage; -import javax.activation.DataSource; -import javax.annotation.Priority; -import javax.ws.rs.Consumes; -import javax.ws.rs.Priorities; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.ext.Provider; +import jakarta.activation.DataSource; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.plugins.providers.FileRange; import org.jboss.resteasy.plugins.providers.jsonb.JsonBindingProvider; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java index cf5d21195fd6e..00f72281b0908 100644 --- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java @@ -5,13 +5,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.plugins.providers.FormUrlEncodedProvider; import org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages; diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter b/extensions/resteasy-classic/resteasy-common/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter new file mode 100644 index 0000000000000..efa644813dcda --- /dev/null +++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter @@ -0,0 +1 @@ +io.quarkus.resteasy.common.runtime.config.ThresholdConverter \ No newline at end of file diff --git a/extensions/resteasy-classic/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java b/extensions/resteasy-classic/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java index d1d367cb9d99e..8d0fdaca441cf 100644 --- a/extensions/resteasy-classic/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java +++ b/extensions/resteasy-classic/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java @@ -5,7 +5,7 @@ import java.util.Set; import java.util.function.Predicate; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; @@ -15,21 +15,21 @@ public final class ResteasyDotNames { - public static final DotName APPLICATION = DotName.createSimple("javax.ws.rs.core.Application"); - public static final DotName CONSUMES = DotName.createSimple("javax.ws.rs.Consumes"); - public static final DotName PRODUCES = DotName.createSimple("javax.ws.rs.Produces"); - public static final DotName PROVIDER = DotName.createSimple("javax.ws.rs.ext.Provider"); - public static final DotName GET = DotName.createSimple("javax.ws.rs.GET"); - public static final DotName HEAD = DotName.createSimple("javax.ws.rs.HEAD"); - public static final DotName DELETE = DotName.createSimple("javax.ws.rs.DELETE"); - public static final DotName OPTIONS = DotName.createSimple("javax.ws.rs.OPTIONS"); - public static final DotName PATCH = DotName.createSimple("javax.ws.rs.PATCH"); - public static final DotName POST = DotName.createSimple("javax.ws.rs.POST"); - public static final DotName PUT = DotName.createSimple("javax.ws.rs.PUT"); - public static final DotName APPLICATION_PATH = DotName.createSimple("javax.ws.rs.ApplicationPath"); - public static final DotName PATH = DotName.createSimple("javax.ws.rs.Path"); - public static final DotName DYNAMIC_FEATURE = DotName.createSimple("javax.ws.rs.container.DynamicFeature"); - public static final DotName CONTEXT = DotName.createSimple("javax.ws.rs.core.Context"); + public static final DotName APPLICATION = DotName.createSimple("jakarta.ws.rs.core.Application"); + public static final DotName CONSUMES = DotName.createSimple("jakarta.ws.rs.Consumes"); + public static final DotName PRODUCES = DotName.createSimple("jakarta.ws.rs.Produces"); + public static final DotName PROVIDER = DotName.createSimple("jakarta.ws.rs.ext.Provider"); + public static final DotName GET = DotName.createSimple("jakarta.ws.rs.GET"); + public static final DotName HEAD = DotName.createSimple("jakarta.ws.rs.HEAD"); + public static final DotName DELETE = DotName.createSimple("jakarta.ws.rs.DELETE"); + public static final DotName OPTIONS = DotName.createSimple("jakarta.ws.rs.OPTIONS"); + public static final DotName PATCH = DotName.createSimple("jakarta.ws.rs.PATCH"); + public static final DotName POST = DotName.createSimple("jakarta.ws.rs.POST"); + public static final DotName PUT = DotName.createSimple("jakarta.ws.rs.PUT"); + public static final DotName APPLICATION_PATH = DotName.createSimple("jakarta.ws.rs.ApplicationPath"); + public static final DotName PATH = DotName.createSimple("jakarta.ws.rs.Path"); + public static final DotName DYNAMIC_FEATURE = DotName.createSimple("jakarta.ws.rs.container.DynamicFeature"); + public static final DotName CONTEXT = DotName.createSimple("jakarta.ws.rs.core.Context"); public static final DotName RESTEASY_QUERY_PARAM = DotName .createSimple("org.jboss.resteasy.annotations.jaxrs.QueryParam"); public static final DotName RESTEASY_FORM_PARAM = DotName @@ -49,8 +49,8 @@ public final class ResteasyDotNames { public static final DotName CDI_INJECT = DotName .createSimple(Inject.class.getName()); public static final DotName JSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore"); - public static final DotName JSONB_TRANSIENT = DotName.createSimple("javax.json.bind.annotation.JsonbTransient"); - public static final DotName XML_TRANSIENT = DotName.createSimple("javax.xml.bind.annotation.XmlTransient"); + public static final DotName JSONB_TRANSIENT = DotName.createSimple("jakarta.json.bind.annotation.JsonbTransient"); + public static final DotName XML_TRANSIENT = DotName.createSimple("jakarta.xml.bind.annotation.XmlTransient"); public static final List JAXRS_METHOD_ANNOTATIONS = List.of(GET, POST, HEAD, DELETE, PUT, PATCH, OPTIONS); @@ -103,12 +103,12 @@ public boolean test(MethodInfo methodInfo) { private static final String[] PACKAGES_IGNORED_FOR_REFLECTION = { // JSON-P - "javax.json.", + "jakarta.json.", "jakarta.json.", // Jackson "com.fasterxml.jackson.databind.", // JAX-RS - "javax.ws.rs.", + "jakarta.ws.rs.", // RESTEasy "org.jboss.resteasy.", // Vert.x JSON layer diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java index d82a6b1092be2..429b6a1682fe2 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.jackson; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello-default") public class HelloNoMediaTypeResource { diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloResource.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloResource.java index 924a6ca639da2..73c354aad634b 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloResource.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloResource.java @@ -2,10 +2,10 @@ import java.time.ZonedDateTime; -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("/hello") diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewResource.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewResource.java index 512cd210283d9..c4150853f0493 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewResource.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/JsonViewResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.jackson; -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 com.fasterxml.jackson.annotation.JsonView; diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/LargeResource.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/LargeResource.java index 7a5849c51c618..c9f8bae22a52c 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/LargeResource.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/LargeResource.java @@ -3,10 +3,10 @@ import java.util.HashMap; import java.util.Map; -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("/large") diff --git a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/TimeCustomizer.java b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/TimeCustomizer.java index f57405f728c30..7efdb9ec1b73d 100644 --- a/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/TimeCustomizer.java +++ b/extensions/resteasy-classic/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/TimeCustomizer.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatterBuilder; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/extensions/resteasy-classic/resteasy-jackson/runtime/pom.xml b/extensions/resteasy-classic/resteasy-jackson/runtime/pom.xml index 958490d823d70..25749f3804871 100644 --- a/extensions/resteasy-classic/resteasy-jackson/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-jackson/runtime/pom.xml @@ -44,8 +44,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java index 8b3d4f1f40e25..e6d430d099d0e 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java +++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java @@ -41,7 +41,7 @@ void addReflectiveClasses(BuildProducer reflectiveClas if (!index.getAnnotations(annotation).isEmpty()) { addReflectiveClass(reflectiveClass, true, true, "org.jboss.resteasy.plugins.providers.jaxb.JaxbCollection"); addReflectiveClass(reflectiveClass, true, true, "org.jboss.resteasy.plugins.providers.jaxb.JaxbMap"); - addReflectiveClass(reflectiveClass, true, true, "javax.xml.bind.annotation.W3CDomHandler"); + addReflectiveClass(reflectiveClass, true, true, "jakarta.xml.bind.annotation.W3CDomHandler"); break; } } diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/Bar.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/Bar.java index a43c6183582b2..3bae80e9872d7 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/Bar.java +++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/Bar.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Bar { diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java index 30830267a2453..7fbb0c7634e2d 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java +++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ConsumesXMLTestCase.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.jaxb.deployment; -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.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java index 29e6a7279a6fa..edc3e25cad32e 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java +++ b/extensions/resteasy-classic/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java @@ -5,12 +5,12 @@ import java.util.Arrays; import java.util.List; -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.jboss.resteasy.annotations.providers.jaxb.Wrapped; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml b/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml index 93c1b60353d00..cb7fba02c5f17 100644 --- a/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml @@ -45,12 +45,12 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java index 3998b9a6fda08..f7f262b2d215f 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java +++ b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.jsonb; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello-default") public class HelloNoMediaTypeResource { diff --git a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java index 439da024276c8..671576d2c0fa7 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java +++ b/extensions/resteasy-classic/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java @@ -4,10 +4,10 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-classic/resteasy-jsonb/runtime/pom.xml b/extensions/resteasy-classic/resteasy-jsonb/runtime/pom.xml index 21b28f1e06022..fb1ce07c8696a 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-jsonb/runtime/pom.xml @@ -26,7 +26,6 @@ org.jboss.resteasy resteasy-json-binding-provider - org.glassfish jakarta.json diff --git a/extensions/resteasy-classic/resteasy-jsonb/runtime/src/main/java/io/quarkus/resteasy/jsonb/vertx/VertxJson.java b/extensions/resteasy-classic/resteasy-jsonb/runtime/src/main/java/io/quarkus/resteasy/jsonb/vertx/VertxJson.java index f5fd3c7822d8c..4854de603bc79 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/runtime/src/main/java/io/quarkus/resteasy/jsonb/vertx/VertxJson.java +++ b/extensions/resteasy-classic/resteasy-jsonb/runtime/src/main/java/io/quarkus/resteasy/jsonb/vertx/VertxJson.java @@ -7,14 +7,14 @@ import java.util.List; import java.util.Map; -import javax.json.JsonNumber; -import javax.json.JsonValue; -import javax.json.bind.serializer.DeserializationContext; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; -import javax.json.stream.JsonParser; +import jakarta.json.JsonNumber; +import jakarta.json.JsonValue; +import jakarta.json.bind.serializer.DeserializationContext; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; +import jakarta.json.stream.JsonParser; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; @@ -33,7 +33,7 @@ private VertxJson() { private final static Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding(); - public static void copy(JsonObject object, javax.json.JsonObject origin) { + public static void copy(JsonObject object, jakarta.json.JsonObject origin) { origin.keySet().forEach(key -> { JsonValue value = origin.get(key); JsonValue.ValueType kind = value.getValueType(); @@ -75,7 +75,7 @@ public static void copy(JsonObject object, javax.json.JsonObject origin) { }); } - public static void copy(JsonArray array, javax.json.JsonArray origin) { + public static void copy(JsonArray array, jakarta.json.JsonArray origin) { for (int i = 0; i < origin.size(); i++) { JsonValue value = origin.get(i); JsonValue.ValueType kind = value.getValueType(); diff --git a/extensions/resteasy-classic/resteasy-jsonb/runtime/src/test/java/io/quarkus/resteasy/jsonb/vertx/VertxJsonTest.java b/extensions/resteasy-classic/resteasy-jsonb/runtime/src/test/java/io/quarkus/resteasy/jsonb/vertx/VertxJsonTest.java index 47836696f81f2..6267fb112884d 100644 --- a/extensions/resteasy-classic/resteasy-jsonb/runtime/src/test/java/io/quarkus/resteasy/jsonb/vertx/VertxJsonTest.java +++ b/extensions/resteasy-classic/resteasy-jsonb/runtime/src/test/java/io/quarkus/resteasy/jsonb/vertx/VertxJsonTest.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; -import javax.json.bind.JsonbConfig; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.json.bind.JsonbConfig; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-classic/resteasy-links/deployment/pom.xml b/extensions/resteasy-classic/resteasy-links/deployment/pom.xml index ae01f7e53c9d3..ceb9252d73c0c 100644 --- a/extensions/resteasy-classic/resteasy-links/deployment/pom.xml +++ b/extensions/resteasy-classic/resteasy-links/deployment/pom.xml @@ -38,8 +38,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/extensions/resteasy-classic/resteasy-links/deployment/src/test/java/io/quarkus/resteasy/links/deployment/TestResource.java b/extensions/resteasy-classic/resteasy-links/deployment/src/test/java/io/quarkus/resteasy/links/deployment/TestResource.java index a2b417099ef07..a542709444122 100644 --- a/extensions/resteasy-classic/resteasy-links/deployment/src/test/java/io/quarkus/resteasy/links/deployment/TestResource.java +++ b/extensions/resteasy-classic/resteasy-links/deployment/src/test/java/io/quarkus/resteasy/links/deployment/TestResource.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -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.links.LinkResource; diff --git a/extensions/resteasy-classic/resteasy-links/runtime/pom.xml b/extensions/resteasy-classic/resteasy-links/runtime/pom.xml index a373ceed2a1cc..7757eeb11a623 100644 --- a/extensions/resteasy-classic/resteasy-links/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-links/runtime/pom.xml @@ -42,8 +42,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation io.quarkus diff --git a/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/HalServerResponseFilter.java b/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/HalServerResponseFilter.java index b2711330b5da7..5f8057b86ff56 100644 --- a/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/HalServerResponseFilter.java +++ b/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/HalServerResponseFilter.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import io.quarkus.arc.Arc; import io.quarkus.hal.HalCollectionWrapper; diff --git a/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/ResteasyHalService.java b/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/ResteasyHalService.java index 6b5161282cb2f..6da3709d42b2f 100644 --- a/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/ResteasyHalService.java +++ b/extensions/resteasy-classic/resteasy-links/runtime/src/main/java/io/quarkus/resteasy/links/runtime/hal/ResteasyHalService.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import org.jboss.resteasy.links.LinksProvider; import org.jboss.resteasy.links.RESTServiceDiscovery; diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java index 4782162069835..a63c9a6fe71f3 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.multipart; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; public class FeedbackBody { diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java index dfe9fb1e3c1c9..84cd957a00615 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.multipart; -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.jboss.resteasy.annotations.providers.multipart.MultipartForm; diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java index 997d2fdbd34af..0ec4d45edab6e 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java @@ -2,8 +2,8 @@ import java.util.Map; -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/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java index 4386bfc6257e4..7edd69e01ac10 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java @@ -2,7 +2,7 @@ import java.net.URISyntaxException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java index ddd3df0e0379d..8a142a25d494d 100644 --- a/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java +++ b/extensions/resteasy-classic/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java @@ -1,12 +1,12 @@ package io.quarkus.resteasy.multipart.parttype; -import javax.transaction.Transactional; -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 jakarta.transaction.Transactional; +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 org.jboss.resteasy.annotations.providers.multipart.MultipartForm; diff --git a/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml b/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml index 2a4a3bb24ef26..60fceb672b5db 100644 --- a/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml @@ -45,8 +45,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation org.jboss.logging diff --git a/extensions/resteasy-classic/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java b/extensions/resteasy-classic/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java index 783ccb4ff6db6..10af695df5f03 100644 --- a/extensions/resteasy-classic/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java +++ b/extensions/resteasy-classic/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.plugins.providers.multipart.InputPart; diff --git a/extensions/resteasy-classic/resteasy-multipart/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/extensions/resteasy-classic/resteasy-multipart/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers similarity index 100% rename from extensions/resteasy-classic/resteasy-multipart/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers rename to extensions/resteasy-classic/resteasy-multipart/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml index f9bc83e92c9e7..cf3625af52f05 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml @@ -22,6 +22,10 @@ io.quarkus quarkus-mutiny + + io.smallrye.reactive + mutiny-zero-flow-adapters + org.jboss.resteasy resteasy-client diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java index 792bfd62a7d7f..c7b0029dfce30 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java @@ -2,9 +2,9 @@ import java.util.concurrent.ExecutorService; -import javax.ws.rs.client.RxInvokerProvider; -import javax.ws.rs.client.SyncInvoker; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.RxInvokerProvider; +import jakarta.ws.rs.client.SyncInvoker; +import jakarta.ws.rs.client.WebTarget; public class MultiInvokerProvider implements RxInvokerProvider { WebTarget target; @@ -27,4 +27,4 @@ public void setTarget(WebTarget target) { this.target = target; } -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java index fa53954b5168e..a8fcdac529730 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java @@ -4,10 +4,11 @@ import org.reactivestreams.Publisher; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public class MultiProvider implements AsyncStreamProvider> { @Override public Publisher toAsyncStream(Multi multi) { - return multi; + return AdaptersToReactiveStreams.publisher(multi); } -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java index c0004a06da245..1fe17b15bd76d 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.mutiny.common.runtime; -import javax.ws.rs.client.RxInvoker; +import jakarta.ws.rs.client.RxInvoker; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.subscription.BackPressureStrategy; @@ -11,4 +11,4 @@ public interface MultiRxInvoker extends RxInvoker> { void setBackPressureStrategy(BackPressureStrategy strategy); -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java index 97ecff37de2c9..3cb1cfeecbefb 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java @@ -5,13 +5,13 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.function.Function; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.SyncInvoker; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.InboundSseEvent; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.SyncInvoker; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.SseEventSource; import org.jboss.resteasy.client.jaxrs.internal.ClientInvocationBuilder; import org.jboss.resteasy.plugins.providers.sse.InboundSseEventImpl; diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java index e67e47d121b1d..9baec7563cf58 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java @@ -2,10 +2,10 @@ import java.util.concurrent.ExecutorService; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.CompletionStageRxInvoker; -import javax.ws.rs.client.RxInvokerProvider; -import javax.ws.rs.client.SyncInvoker; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.CompletionStageRxInvoker; +import jakarta.ws.rs.client.RxInvokerProvider; +import jakarta.ws.rs.client.SyncInvoker; import org.jboss.resteasy.client.jaxrs.internal.ClientInvocationBuilder; @@ -26,4 +26,4 @@ public UniRxInvoker getRxInvoker(SyncInvoker syncInvoker, ExecutorService execut throw new ProcessingException("Expected a ClientInvocationBuilder"); } } -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java index b265dff7d0e8a..e7a3f8c4a26e8 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.mutiny.common.runtime; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.RxInvoker; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.RxInvoker; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; @@ -84,4 +84,4 @@ public interface UniRxInvoker extends RxInvoker> { @Override Uni method(String name, Entity entity, GenericType responseType); -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java index 36e501816c6db..bdac1cfebf191 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java @@ -3,10 +3,10 @@ import java.util.concurrent.CompletionStage; import java.util.function.Supplier; -import javax.ws.rs.client.CompletionStageRxInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.CompletionStageRxInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java index 1144b7e535044..9ff98a595da42 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java @@ -8,6 +8,7 @@ import io.quarkus.resteasy.mutiny.common.runtime.MultiProvider; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToFlow; public class MultiProviderTest { @@ -17,7 +18,8 @@ public class MultiProviderTest { public void test() { Multi multi = Multi.createFrom().items(1, 2, 3); Publisher publisher = provider.toAsyncStream(multi); - List list = Multi.createFrom().publisher(publisher).collect().asList().await().indefinitely(); + List list = Multi.createFrom().publisher(AdaptersToFlow.publisher(publisher)).collect().asList().await() + .indefinitely(); Assertions.assertEquals(1, list.get(0)); Assertions.assertEquals(2, list.get(1)); Assertions.assertEquals(3, list.get(2)); diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java index 75ed84a93cbf4..333df9c2f2ebd 100644 --- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java +++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java @@ -8,10 +8,10 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.client.CompletionStageRxInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.CompletionStageRxInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyInjector.java b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyInjector.java index 48d71116e54a3..bbfd68f2ff192 100644 --- a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyInjector.java +++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyInjector.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.ContextInjector; diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyResource.java b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyResource.java index d2e7d3f54a91d..e0424bb05031c 100644 --- a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyResource.java +++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/MutinyResource.java @@ -1,12 +1,12 @@ package io.quarkus.resteasy.mutiny.test; -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.Response; +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.Response; import org.jboss.resteasy.annotations.Stream; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java index c6a531e374a30..d545ae856790d 100644 --- a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java +++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/RestEasyMutinyTest.java @@ -4,8 +4,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/ResourceProducingJsonObject.java b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/ResourceProducingJsonObject.java index 1e7d8cee16cd5..3b1c781f33fc3 100644 --- a/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/ResourceProducingJsonObject.java +++ b/extensions/resteasy-classic/resteasy-mutiny/deployment/src/test/java/io/quarkus/resteasy/mutiny/test/vertx/ResourceProducingJsonObject.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.mutiny.test.vertx; -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.Multi; import io.smallrye.mutiny.Uni; diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java index 9759857a7c70c..b822ff527d9c8 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java @@ -2,11 +2,11 @@ import java.util.Locale; -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.qute.Template; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java index 137b4d9ed82ea..12aae605800a8 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java @@ -2,9 +2,9 @@ import java.util.Map; -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 org.jboss.resteasy.annotations.jaxrs.QueryParam; diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java index 4842d2a3ddbc6..772a6c2c96517 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java @@ -1,10 +1,10 @@ package io.quarkus.qute.resteasy.deployment; -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.quarkus.qute.CheckedTemplate; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateResource.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateResource.java index 4fc06ee5312c1..8a65551536392 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateResource.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateResource.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import io.quarkus.qute.CheckedTemplate; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorResource.java b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorResource.java index a0b859d9822ba..1b464bd83254d 100644 --- a/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorResource.java +++ b/extensions/resteasy-classic/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorResource.java @@ -1,7 +1,7 @@ package io.quarkus.qute.resteasy.deployment; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.qute.CheckedTemplate; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/RestTemplate.java b/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/RestTemplate.java index dc8780c303b2e..c8b75e9ff8d54 100644 --- a/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/RestTemplate.java +++ b/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/RestTemplate.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.qute; -import javax.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.container.ResourceInfo; import org.jboss.resteasy.core.ResteasyContext; diff --git a/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java b/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java index 57c95f6505d32..e14979186f312 100644 --- a/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java +++ b/extensions/resteasy-classic/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java @@ -7,11 +7,11 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.core.interception.jaxrs.SuspendableContainerResponseContext; @@ -36,12 +36,12 @@ public void filter(ContainerRequestContext requestContext, ContainerResponseCont TemplateInstance instance = (TemplateInstance) entity; Object variantsAttr = instance.getAttribute(TemplateInstance.VARIANTS); if (variantsAttr != null) { - List variants = new ArrayList<>(); + List variants = new ArrayList<>(); for (Variant variant : (List) variantsAttr) { - variants.add(new javax.ws.rs.core.Variant(MediaType.valueOf(variant.getMediaType()), variant.getLocale(), + variants.add(new jakarta.ws.rs.core.Variant(MediaType.valueOf(variant.getMediaType()), variant.getLocale(), variant.getEncoding())); } - javax.ws.rs.core.Variant selected = requestContext.getRequest() + jakarta.ws.rs.core.Variant selected = requestContext.getRequest() .selectVariant(variants); if (selected != null) { diff --git a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java index 4301addd0562e..cd49b25811585 100644 --- a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java @@ -18,7 +18,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; @@ -88,10 +88,10 @@ public class ResteasyServerCommonProcessor { private static final Logger log = Logger.getLogger("io.quarkus.resteasy"); - private static final String JAX_RS_APPLICATION_PARAMETER_NAME = "javax.ws.rs.Application"; + private static final String JAX_RS_APPLICATION_PARAMETER_NAME = "jakarta.ws.rs.Application"; private static final String MESSAGES_RESOURCE_BUNDLE = "messages"; - private static final DotName JSONB_ANNOTATION = DotName.createSimple("javax.json.bind.annotation.JsonbAnnotation"); + private static final DotName JSONB_ANNOTATION = DotName.createSimple("jakarta.json.bind.annotation.JsonbAnnotation"); private static final List METHOD_ANNOTATIONS = List.of( ResteasyDotNames.GET, @@ -129,7 +129,7 @@ static final class ResteasyConfig { * this annotation will always be used to control the lifecycle of the resource * class. *

    - * IMPLEMENTATION NOTE: {@code javax.ws.rs.Path} turns into a CDI stereotype + * IMPLEMENTATION NOTE: {@code jakarta.ws.rs.Path} turns into a CDI stereotype * with singleton scope. As a result, if a user annotates a JAX-RS resource with * a stereotype which has a different default scope the deployment fails with * IllegalStateException. @@ -478,10 +478,10 @@ List registerCompatibleAnnotationPrefixes prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("kotlin")); // make sure the annotation that the Kotlin compiler adds don't interfere with creating a default constructor prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("lombok")); // same for lombok prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("io.quarkus.security")); // same for the security annotations - prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("javax.annotation.security")); + prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("jakarta.annotation.security")); prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("jakarta.annotation.security")); prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("java.lang")); - prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("javax.inject")); + prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("jakarta.inject")); return prefixes; } @@ -1000,7 +1000,7 @@ private static Set getAllowedClasses(IndexView index) { selectedAppClass = applicationClassInfo; if (selectedAppClass.annotationsMap().containsKey(ResteasyDotNames.CDI_INJECT)) { throw new RuntimeException( - "Usage of '@Inject' is not allowed in 'javax.ws.rs.core.Application' classes. Offending class is '" + "Usage of '@Inject' is not allowed in 'jakarta.ws.rs.core.Application' classes. Offending class is '" + selectedAppClass.name() + "'"); } diff --git a/extensions/resteasy-classic/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java b/extensions/resteasy-classic/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java index 554830b905fb3..a6ecc8ee8e001 100644 --- a/extensions/resteasy-classic/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java +++ b/extensions/resteasy-classic/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.function.Function; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java index a187ebafb220c..a0a1683e465ff 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java @@ -26,7 +26,7 @@ public class RestPathAnnotationProcessor { - static final DotName REST_PATH = DotName.createSimple("javax.ws.rs.Path"); + static final DotName REST_PATH = DotName.createSimple("jakarta.ws.rs.Path"); static final DotName REGISTER_REST_CLIENT = DotName .createSimple("org.eclipse.microprofile.rest.client.inject.RegisterRestClient"); static final DotName TEMPLATE_PATH = DotName.createSimple(QuarkusRestPathTemplate.class.getName()); diff --git a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java index 1bac198489765..a1b0040af4bda 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java @@ -7,8 +7,8 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.servlet.DispatcherType; -import javax.ws.rs.core.Application; +import jakarta.servlet.DispatcherType; +import jakarta.ws.rs.core.Application; import org.jboss.logging.Logger; import org.jboss.metadata.web.spec.ServletMappingMetaData; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java index a63334d0cbdf1..4dd5a3fd1cd48 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java @@ -5,7 +5,7 @@ import java.util.Optional; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java index 7c8591fad9369..137a8160d0ebd 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheControlFeatureTest.java @@ -2,7 +2,7 @@ import static io.restassured.RestAssured.when; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheResource.java index fef3e180dba98..bf1dd961197de 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CacheResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.resteasy.annotations.cache.Cache; import org.jboss.resteasy.annotations.cache.NoCache; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResource.java index 1b78b0b158a0f..cba5bd71c1a47 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ConstructorInjectionResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/ctor") public class ConstructorInjectionResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java index 6d33f4e1efd0c..ed5545229dfc2 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java @@ -2,9 +2,9 @@ import java.nio.charset.StandardCharsets; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("/length") public class ContentLengthResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java index 2b2a15bf2486d..59489f6559efe 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContextTest.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test; -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; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java index 9529ef06021b1..bdbea7cad6a67 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/CustomExceptionMapperTestCase.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.test; -import javax.enterprise.context.Dependent; -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.enterprise.context.Dependent; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java index a3c314c2d116f..d1829a6e4f2d5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ExceptionReturnStatusAndBodyTest.java @@ -2,14 +2,14 @@ import static org.hamcrest.Matchers.containsString; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java index 73b8e79c45cea..14f634c246e19 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/GreetingResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/GreetingResource.java index 98db8180f973a..dd952dddb92bd 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/GreetingResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test; -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.config.inject.ConfigProperty; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java index c14d23ff9fbbc..44bfa7a7fbc2c 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java @@ -8,10 +8,10 @@ import java.util.TimerTask; import java.util.concurrent.LinkedBlockingDeque; -import javax.annotation.PreDestroy; -import javax.enterprise.event.Observes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import io.vertx.core.Handler; import io.vertx.ext.web.Router; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithRemainderTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithRemainderTest.java index e7d4640d8d24b..d5df11f5fd1b2 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithRemainderTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithRemainderTest.java @@ -5,10 +5,10 @@ import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithoutRemainderTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithoutRemainderTest.java index 13058afdee431..0598bf54a9f52 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithoutRemainderTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseLargePayloadWithoutRemainderTest.java @@ -5,10 +5,10 @@ import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseTest.java index bc40117a793d6..2be97468a5e53 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResponseTest.java @@ -5,10 +5,10 @@ import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InterfaceResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InterfaceResource.java index 09325e0a18e03..f0d36cb9a9924 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InterfaceResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InterfaceResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test; -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("/inter") public interface InterfaceResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonResource.java index 903a2fc79c980..0e993d41d4016 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/JsonResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.test; -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 io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MalformedURLTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MalformedURLTestCase.java index b175890e78d68..652feb95993cd 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MalformedURLTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MalformedURLTestCase.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxBodySizeResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxBodySizeResource.java index 12b8b35414931..7c566f9f77f74 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxBodySizeResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/MaxBodySizeResource.java @@ -2,12 +2,12 @@ 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.Context; -import javax.ws.rs.core.HttpHeaders; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; @Path("/max-body-size") public class MaxBodySizeResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NoProducesValueTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NoProducesValueTest.java index b0482bc96a4d2..aa69345a277b5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NoProducesValueTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NoProducesValueTest.java @@ -2,10 +2,10 @@ import static io.restassured.RestAssured.given; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java index 3b98d31d4befe..04fdc2dd0b5f4 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NullHeaderTestCase.java @@ -4,13 +4,13 @@ import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -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.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java index c39e881921278..935d56d074cf5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PathInterfaceImplementorTest.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.test; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostEndpoint.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostEndpoint.java index 8184796f5620e..003589225cc5f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostEndpoint.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/post") public class PostEndpoint { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostResource.java index bb0251bb111c2..ba09ace95c3dc 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/PostResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.test; -import javax.annotation.PreDestroy; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.PreDestroy; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/post") public class PostResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ProviderConfigInjectionTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ProviderConfigInjectionTest.java index e014d2d9a5d39..7c6a8182ad8c0 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ProviderConfigInjectionTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ProviderConfigInjectionTest.java @@ -1,15 +1,15 @@ package io.quarkus.resteasy.test; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; -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.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; +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.MediaType; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.hamcrest.Matchers; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/QueryParamTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/QueryParamTest.java index 8d4423ed029a9..0afd30933fc54 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/QueryParamTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/QueryParamTest.java @@ -4,9 +4,9 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RootResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RootResource.java index f1375d319dc14..59a7acf951eb1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RootResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/RootResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/") public class RootResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/Service.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/Service.java index b2ed70d0d1417..cd43ace594413 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/Service.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/Service.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.test; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class Service { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SetCookieResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SetCookieResource.java index 47c28230551c3..ac707b77d87c0 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SetCookieResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SetCookieResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.spi.HttpResponse; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SingletonConstructorInjectionResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SingletonConstructorInjectionResource.java index 2bf60255953dc..c7c25cbf91add 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SingletonConstructorInjectionResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/SingletonConstructorInjectionResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.test; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Singleton @Path("/ctor-single") diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOResource.java index 9b3b7471bd9c6..14a3a86327ad8 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/asyncio/AsyncIOResource.java @@ -3,9 +3,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -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.vertx.core.Context; import io.vertx.core.Vertx; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/GreetingEndpoint.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/GreetingEndpoint.java index b901300df3876..96736ca179c73 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/GreetingEndpoint.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/GreetingEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.test.cdi; -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; /** * diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/MorningGreeting.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/MorningGreeting.java index e7a3a6bde9dc5..da7f5a69029d4 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/MorningGreeting.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/cdi/MorningGreeting.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.test.cdi; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; /** * diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java index 420fefbce27a5..e981d95784807 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java @@ -4,14 +4,14 @@ import java.io.IOException; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ProviderConfigInjectionWarningsTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ProviderConfigInjectionWarningsTest.java index 0eb3bdd0d6bd0..36bf7d4ae4e76 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ProviderConfigInjectionWarningsTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ProviderConfigInjectionWarningsTest.java @@ -8,15 +8,15 @@ import java.util.logging.LogRecord; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; -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.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; +import jakarta.enterprise.inject.Instance; +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.MediaType; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -39,13 +39,13 @@ public class ProviderConfigInjectionWarningsTest { assertEquals(4, logRecords.size()); Set messages = logRecords.stream().map(LogRecord::getMessage).collect(Collectors.toSet()); assertTrue(messages.contains( - "Directly injecting a org.eclipse.microprofile.config.Config into a javax.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to javax.enterprise.inject.Instance. Offending field is 'config' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); + "Directly injecting a org.eclipse.microprofile.config.Config into a jakarta.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to jakarta.enterprise.inject.Instance. Offending field is 'config' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); assertTrue(messages.contains( - "Directly injecting a io.smallrye.config.SmallRyeConfig into a javax.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to javax.enterprise.inject.Instance. Offending field is 'smallRyeConfig' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); + "Directly injecting a io.smallrye.config.SmallRyeConfig into a jakarta.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to jakarta.enterprise.inject.Instance. Offending field is 'smallRyeConfig' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); assertTrue(messages.contains( - "Directly injecting a org.eclipse.microprofile.config.inject.ConfigProperty into a javax.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to javax.enterprise.inject.Instance. Offending field is 'configProperty' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); + "Directly injecting a org.eclipse.microprofile.config.inject.ConfigProperty into a jakarta.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to jakarta.enterprise.inject.Instance. Offending field is 'configProperty' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); assertTrue(messages.contains( - "Directly injecting a io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$MyConfigMapping into a javax.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to javax.enterprise.inject.Instance. Offending field is 'myConfigMapping' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); + "Directly injecting a io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$MyConfigMapping into a jakarta.ws.rs.ext.Provider may lead to unexpected results. To ensure proper results, please change the type of the field to jakarta.enterprise.inject.Instance. Offending field is 'myConfigMapping' of class 'io.quarkus.resteasy.test.config.ProviderConfigInjectionWarningsTest$FooProvider'")); }); @Test diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java index 129d7a8e86eb5..90f2cfca1fd97 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test.gzip; -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.annotations.GZIP; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java index 6bd67f5507f4b..e972caea77768 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java @@ -2,11 +2,11 @@ import static java.util.stream.Collectors.toList; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; @Path("multipart/") public class MultipartResource { @@ -20,4 +20,4 @@ public String hello(MultivaluedMap formData) { .toString(); } -} \ No newline at end of file +} diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java index 6830f2ecfb312..7d9bc1e7c85c1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathHttpRootTest.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test.root; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java index fb6372ecd5fb3..3ffb445ac1423 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationPathTest.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test.root; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java index 9cd3eabd0d14f..eb5c2ad1879d0 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java @@ -9,15 +9,15 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.*; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.*; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java index 921f141cc2f7d..b275ab739a2b1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java @@ -6,18 +6,18 @@ import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java index beca4c5acdca5..3cf6d40acb46b 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/route/UserRouteTest.java @@ -2,8 +2,8 @@ import static org.hamcrest.core.Is.is; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationFailedExceptionHeaderTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationFailedExceptionHeaderTest.java index 740494074d9d6..2a6dd9a4b1742 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationFailedExceptionHeaderTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationFailedExceptionHeaderTest.java @@ -5,9 +5,9 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationRedirectExceptionHeaderTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationRedirectExceptionHeaderTest.java index b46efe9d16aef..94b516da9aa3a 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationRedirectExceptionHeaderTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/AuthenticationRedirectExceptionHeaderTest.java @@ -6,9 +6,9 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java index cc7622615f928..fb13a3d50cbf6 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DefaultRolesAllowedJaxRsTest.java @@ -3,9 +3,9 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -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; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java index 5ac0fe79312e6..90cd2a9f77390 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/DenyAllJaxRsTest.java @@ -4,9 +4,9 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.emptyString; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/HttpPolicyAuthFailureExceptionMapperTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/HttpPolicyAuthFailureExceptionMapperTest.java index d8e3f3ce9dc50..3e1eaab34cffc 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/HttpPolicyAuthFailureExceptionMapperTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/HttpPolicyAuthFailureExceptionMapperTest.java @@ -4,11 +4,11 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/PermitAllResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/PermitAllResource.java index ab9dc1ec18459..a38c5890969b1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/PermitAllResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/PermitAllResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.test.security; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionHandlerTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionHandlerTest.java index 44dbffff92614..15ec62f2911b0 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionHandlerTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionHandlerTest.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionMapperTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionMapperTest.java index f5372c7166fb1..a45fae624ca92 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionMapperTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthCompletionExceptionMapperTest.java @@ -1,16 +1,16 @@ package io.quarkus.resteasy.test.security; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExHandlerTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExHandlerTest.java index 34f90cd676b0e..4e063c8e0a0f1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExHandlerTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExHandlerTest.java @@ -1,15 +1,15 @@ package io.quarkus.resteasy.test.security; import static io.quarkus.resteasy.test.security.ProactiveAuthHttpPolicyCustomForbiddenExHandlerTest.CustomForbiddenFailureHandler.CUSTOM_FORBIDDEN_EXCEPTION_HANDLER; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static org.hamcrest.Matchers.equalTo; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExMapperTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExMapperTest.java index 868e3c35a99ce..d42589338bbb1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExMapperTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ProactiveAuthHttpPolicyCustomForbiddenExMapperTest.java @@ -1,18 +1,18 @@ package io.quarkus.resteasy.test.security; import static io.quarkus.resteasy.test.security.ProactiveAuthHttpPolicyCustomForbiddenExMapperTest.CustomForbiddenExceptionMapper.CUSTOM_FORBIDDEN_EXCEPTION_MAPPER; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static org.hamcrest.Matchers.equalTo; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedResource.java index 5c612b4a7cd1e..6a285c54ac91a 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/RolesAllowedResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.test.security; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.security.identity.CurrentIdentityAssociation; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityIdentityAugmentorTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityIdentityAugmentorTest.java index 92ceac105166e..7d50c1e8ec0e2 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityIdentityAugmentorTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityIdentityAugmentorTest.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityOverrideFilter.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityOverrideFilter.java index 4d38509b00946..46cccc13484b1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityOverrideFilter.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/SecurityOverrideFilter.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.security.Principal; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; @Provider @PreMatching diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredResource.java index 96607e8c88d66..2d4eedc5fcfb5 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.test.security; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredSubResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredSubResource.java index 993f747e7761c..4f48b1fcbe546 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredSubResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UnsecuredSubResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test.security; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UserResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UserResource.java index fea9158e7bbba..7caf17919cd59 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UserResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/UserResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.test.security; -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("/user") public class UserResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseResource.java index b439b204da787..fc218b27819f1 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseResource.java @@ -2,14 +2,14 @@ import java.io.IOException; -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.sse.Sse; -import javax.ws.rs.sse.SseBroadcaster; -import javax.ws.rs.sse.SseEventSink; +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.sse.Sse; +import jakarta.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.SseEventSink; @Path("sse") public class SseResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java index e54f9c8959507..c9159c4c377c2 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/sse/SseTestCase.java @@ -5,11 +5,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.sse.InboundSseEvent; -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.InboundSseEvent; +import jakarta.ws.rs.sse.SseEventSource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/MyService.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/MyService.java index 617228f73231e..431b92ffe294f 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/MyService.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/MyService.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.test.subresource; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyService { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingResource.java index 9fccb55785edd..50402f11d9ed7 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.test.subresource; -import javax.inject.Inject; -import javax.ws.rs.GET; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; public class PingResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingsResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingsResource.java index af2032fa5a638..8b95669473f9a 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingsResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/PingsResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.test.subresource; -import javax.ws.rs.Path; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.core.Context; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.core.Context; @Path("pings") public class PingsResource { diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SuperPingResource.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SuperPingResource.java index d882cb283837c..465529458f5c7 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SuperPingResource.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/subresource/SuperPingResource.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.test.subresource; -import javax.ws.rs.GET; +import jakarta.ws.rs.GET; public class SuperPingResource extends PingResource { diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java index 5d20cf5e312de..4d8e1d83915c4 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.runtime; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationFailedExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationFailedExceptionMapper.java index c8f8c57a92ae0..77cd8b809611b 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationFailedExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationFailedExceptionMapper.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.runtime; -import javax.annotation.Priority; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java index 91c0f194fffdb..89cb5f317431b 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.runtime; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.quarkus.security.AuthenticationRedirectException; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java index b859c33b9af37..65c26ee14cee8 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.runtime; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; import io.smallrye.mutiny.CompositeException; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ForbiddenExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ForbiddenExceptionMapper.java index 8a4a5c4f29140..e4ce77413cf31 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ForbiddenExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ForbiddenExceptionMapper.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.runtime; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.quarkus.security.ForbiddenException; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java index 68b5c7c1c1573..d85d703202e53 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java @@ -25,18 +25,18 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Variant; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Variant; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; import org.jboss.resteasy.core.ResourceMethodInvoker; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplate.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplate.java index 531231ef3df18..28d86707c70dd 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplate.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplate.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; @Inherited @InterceptorBinding diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java index 80df6d2aee8fc..9223cd93f9232 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java @@ -3,12 +3,12 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.context.ContextNotActiveException; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.ArcInvocationContext; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java index 41415eefebf5b..0d500c492044a 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.enterprise.inject.spi.CDI; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.jboss.resteasy.plugins.server.servlet.Filter30Dispatcher; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java index 99a5bbbd2558f..79eaee4b59edc 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.enterprise.inject.spi.CDI; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/SecurityContextFilter.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/SecurityContextFilter.java index aae0baca9a677..50b9e743f7c24 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/SecurityContextFilter.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/SecurityContextFilter.java @@ -6,14 +6,14 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.plugins.server.servlet.ServletSecurityContext; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/UnauthorizedExceptionMapper.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/UnauthorizedExceptionMapper.java index 478aa4ab70f8d..2257721327874 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/UnauthorizedExceptionMapper.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/UnauthorizedExceptionMapper.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.runtime; -import javax.annotation.Priority; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/QuarkusResteasySecurityContext.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/QuarkusResteasySecurityContext.java index 3232c69f10698..5fb302ec8c48c 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/QuarkusResteasySecurityContext.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/QuarkusResteasySecurityContext.java @@ -2,7 +2,7 @@ import java.security.Principal; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.SecurityContext; import io.quarkus.security.identity.CurrentIdentityAssociation; import io.quarkus.security.identity.SecurityIdentity; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java index 8e7b7391b71ce..328adaa5454da 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpRequest.java @@ -13,11 +13,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.ws.rs.ServiceUnavailableException; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.core.AbstractAsynchronousResponse; import org.jboss.resteasy.core.AbstractExecutionContext; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpResponse.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpResponse.java index 5e5440491e2f1..2d7d75d821b1b 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpResponse.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxHttpResponse.java @@ -6,10 +6,10 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.spi.HttpResponse; import org.jboss.resteasy.spi.ResteasyProviderFactory; @@ -75,7 +75,7 @@ public OutputStream getOutputStream() throws IOException { @Override public void addNewCookie(NewCookie cookie) { - outputHeaders.add(javax.ws.rs.core.HttpHeaders.SET_COOKIE, cookie); + outputHeaders.add(jakarta.ws.rs.core.HttpHeaders.SET_COOKIE, cookie); } void checkException() throws IOException { @@ -192,12 +192,13 @@ private void prepareWrite(ByteBuf buffer, boolean finished) throws IOException { boolean explicitChunked = "chunked".equalsIgnoreCase(response.headers().get("transfer-encoding")); if (!explicitChunked) { if (buffer == null) { - getOutputHeaders().putSingle(javax.ws.rs.core.HttpHeaders.CONTENT_LENGTH, "0"); + getOutputHeaders().putSingle(jakarta.ws.rs.core.HttpHeaders.CONTENT_LENGTH, "0"); } else { - getOutputHeaders().putSingle(javax.ws.rs.core.HttpHeaders.CONTENT_LENGTH, "" + buffer.readableBytes()); + getOutputHeaders().putSingle(jakarta.ws.rs.core.HttpHeaders.CONTENT_LENGTH, + "" + buffer.readableBytes()); } } - } else if (!response.headers().contains(javax.ws.rs.core.HttpHeaders.CONTENT_LENGTH)) { + } else if (!response.headers().contains(jakarta.ws.rs.core.HttpHeaders.CONTENT_LENGTH)) { response.setChunked(true); } } diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java index 208d0fc2a274a..9cf440b2a9b6e 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java @@ -5,7 +5,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.BiConsumer; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.spi.AsyncOutputStream; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java index 6ba7df57dcb29..4d918267460a0 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java @@ -10,9 +10,9 @@ import java.util.Map; import java.util.concurrent.Executor; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.core.SecurityContext; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.core.SecurityContext; import org.jboss.logging.Logger; import org.jboss.resteasy.core.ResteasyContext; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxUtil.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxUtil.java index 72b62c7f43f63..bf0d8f73944ba 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxUtil.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxUtil.java @@ -6,9 +6,9 @@ import java.util.Map; import java.util.regex.Pattern; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.specimpl.ResteasyHttpHeaders; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayReader.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayReader.java index 13a88f65d1798..b5c6d14ee56a8 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayReader.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayReader.java @@ -6,13 +6,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NoContentException; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NoContentException; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayWriter.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayWriter.java index 2d31a25164449..21ecffd68b9f7 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayWriter.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonArrayWriter.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.util.concurrent.CompletionStage; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.AsyncMessageBodyWriter; import org.jboss.resteasy.spi.AsyncOutputStream; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectReader.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectReader.java index b607a172b8f8d..ece2148e216e8 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectReader.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectReader.java @@ -6,13 +6,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NoContentException; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NoContentException; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectWriter.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectWriter.java index 843b787716a01..833002f2e42b2 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectWriter.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/vertx/JsonObjectWriter.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.util.concurrent.CompletionStage; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.AsyncMessageBodyWriter; import org.jboss.resteasy.spi.AsyncOutputStream; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveEnricher.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveEnricher.java index bdf9bce29894c..599bc2760762d 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveEnricher.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveEnricher.java @@ -19,7 +19,7 @@ public interface JaxrsClientReactiveEnricher { * Class-level alterations * * Used by MicroProfile Rest Client implementation (quarkus-rest-client-reactive) to support - * {@link javax.ws.rs.ext.Provider}, {@code @ClientHeadersFactory}, etc + * {@link jakarta.ws.rs.ext.Provider}, {@code @ClientHeadersFactory}, etc * * Please note that this won't be invoked for sub-resources * @@ -32,13 +32,13 @@ void forClass(MethodCreator ctor, AssignableResultHandle globalTarget, ClassInfo interfaceClass, IndexView index); /** - * Called when a {@link javax.ws.rs.client.WebTarget} has been populated for a normal Client + * Called when a {@link jakarta.ws.rs.client.WebTarget} has been populated for a normal Client */ void forWebTarget(MethodCreator methodCreator, IndexView index, ClassInfo interfaceClass, MethodInfo method, AssignableResultHandle webTarget, BuildProducer generatedClasses); /** - * Called when a {@link javax.ws.rs.client.WebTarget} has been populated for a sub Client + * Called when a {@link jakarta.ws.rs.client.WebTarget} has been populated for a sub Client */ void forSubResourceWebTarget(MethodCreator methodCreator, IndexView index, ClassInfo rootInterfaceClass, ClassInfo subInterfaceClass, diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java index db778f22b64cb..5d9b42b7faaaf 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java @@ -40,21 +40,21 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.AsyncInvoker; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.CompletionStageRxInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.RxInvoker; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.AsyncInvoker; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.CompletionStageRxInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.RxInvoker; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java index d4389344a49b0..15e48893a86f2 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java @@ -8,15 +8,15 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; -import javax.enterprise.event.Observes; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientRequestFilterAbortWithTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientRequestFilterAbortWithTestCase.java index 4802cae29341d..2558309ccc46d 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientRequestFilterAbortWithTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientRequestFilterAbortWithTestCase.java @@ -4,14 +4,14 @@ import java.net.URL; -import javax.enterprise.event.Observes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java index b58c399113030..78c0c8c9ce68c 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/ClientResponseFilterTestCase.java @@ -4,12 +4,12 @@ import java.net.URL; -import javax.enterprise.event.Observes; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java index fbad3411d4303..7d0e83a1fe623 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/FailureTestCase.java @@ -2,13 +2,13 @@ import java.net.URL; -import javax.enterprise.event.Observes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/QueryParamNoTemplateTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/QueryParamNoTemplateTestCase.java index c95eafaa5bcaf..ca398f4d50295 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/QueryParamNoTemplateTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/QueryParamNoTemplateTestCase.java @@ -3,9 +3,9 @@ import java.net.URL; import java.util.stream.Collectors; -import javax.enterprise.event.Observes; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.jboss.resteasy.reactive.client.impl.UniInvoker; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java index 3c9480c670ab9..d5cdc124561e5 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/UniInvokerTestCase.java @@ -2,9 +2,9 @@ import java.net.URL; -import javax.enterprise.event.Observes; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.jboss.resteasy.reactive.client.impl.UniInvoker; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ClientResponseBuilderFactory.java b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ClientResponseBuilderFactory.java index c9d8eb06a5000..00f1e9174c44a 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ClientResponseBuilderFactory.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/ClientResponseBuilderFactory.java @@ -1,6 +1,6 @@ package io.quarkus.jaxrs.client.reactive.runtime; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder; import org.jboss.resteasy.reactive.client.impl.ClientResponseBuilderImpl; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/JaxrsClientReactiveRecorder.java b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/JaxrsClientReactiveRecorder.java index f67b99b9ce37a..8d5294112fe30 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/JaxrsClientReactiveRecorder.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/JaxrsClientReactiveRecorder.java @@ -6,9 +6,9 @@ import java.util.Map; import java.util.function.BiFunction; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.client.impl.ClientProxies; import org.jboss.resteasy.reactive.client.impl.ClientSerialisers; diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/RestClientBase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/RestClientBase.java index ce86ac8f57897..8f456e298c5f8 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/RestClientBase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/java/io/quarkus/jaxrs/client/reactive/runtime/RestClientBase.java @@ -8,8 +8,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; public abstract class RestClientBase implements Closeable { private static final ParamConverter BYTE_CONVERTER = new ParamConverter() { diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder b/extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder similarity index 100% rename from extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder rename to extensions/resteasy-reactive/jaxrs-client-reactive/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java index ec1636967f1b5..097e5ff894e31 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java index e59b845aa7d67..1a91c19e9b838 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java @@ -17,19 +17,19 @@ public class QuarkusResteasyReactiveDotNames { public static final DotName HTTP_SERVER_RESPONSE = DotName.createSimple(HttpServerResponse.class.getName()); public static final DotName ROUTING_CONTEXT = DotName.createSimple(RoutingContext.class.getName()); public static final DotName JSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore"); - public static final DotName JSONB_TRANSIENT = DotName.createSimple("javax.json.bind.annotation.JsonbTransient"); + public static final DotName JSONB_TRANSIENT = DotName.createSimple("jakarta.json.bind.annotation.JsonbTransient"); public static final IgnoreTypeForReflectionPredicate IGNORE_TYPE_FOR_REFLECTION_PREDICATE = new IgnoreTypeForReflectionPredicate(); public static final IgnoreFieldForReflectionPredicate IGNORE_FIELD_FOR_REFLECTION_PREDICATE = new IgnoreFieldForReflectionPredicate(); public static final IgnoreMethodForReflectionPredicate IGNORE_METHOD_FOR_REFLECTION_PREDICATE = new IgnoreMethodForReflectionPredicate(); private static final String[] PACKAGES_IGNORED_FOR_REFLECTION = { // JSON-P - "javax.json.", + "jakarta.json.", "jakarta.json.", // Jackson "com.fasterxml.jackson.databind.", // JAX-RS - "javax.ws.rs.", + "jakarta.ws.rs.", // RESTEasy "org.jboss.resteasy.reactive", // Vert.x JSON layer diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java index fa92296e337b1..85f7df663004b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java @@ -17,8 +17,8 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java index ed7b85ae91ad0..f552957a7eea1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.model.ResourceReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java index 95badca93dd83..9e6e796402319 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java @@ -12,7 +12,7 @@ * If a JAX-RS resource uses something like @QueryParam, @HeaderParam or the like in a constructor parameter, * then we need to make sure that Arc doesn't create a bean for it automatically (as it will fail validation because * there is no way to pass the parameter). - * For these resources we add {@link javax.enterprise.inject.Vetoed}, and we generate custom CDI producers under the hood + * For these resources we add {@link jakarta.enterprise.inject.Vetoed}, and we generate custom CDI producers under the hood * in {@link CustomResourceProducersGenerator#generate}. */ public class VetoingAnnotationTransformer implements AnnotationsTransformer { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java index e8379dc1cb43f..e8fb72fe0c9c1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java @@ -5,10 +5,10 @@ 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 jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import io.vertx.core.buffer.Buffer; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml index 381878e1d513d..ee5ecf62f34bd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml @@ -18,8 +18,8 @@ quarkus-core-deployment - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java index edd86d2914ffc..1c7c9514c4e29 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java @@ -3,8 +3,8 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; import io.quarkus.builder.item.MultiBuildItem; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java index cd282b682a472..8761b4d785687 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java @@ -3,8 +3,8 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; import io.quarkus.builder.item.MultiBuildItem; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java index e601c795e1700..976f1b3139b5a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.stream.Collectors; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; public interface RuntimeTypeItem { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyReader.java index 5fa3e73e790d2..69a5a8bf84f66 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyReader.java @@ -5,10 +5,10 @@ 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.MessageBodyReader; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; import org.jboss.resteasy.reactive.common.providers.serialisers.PrimitiveBodyHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyWriter.java index b8d32dea2dd7a..32e6a485bbdfd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayBasicMessageBodyWriter.java @@ -6,10 +6,10 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import io.vertx.core.json.JsonArray; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyReader.java index 80edf90521481..9b81c360dbf36 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyReader.java @@ -5,10 +5,10 @@ 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.MessageBodyReader; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; import org.jboss.resteasy.reactive.common.providers.serialisers.PrimitiveBodyHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyWriter.java index 7d79e758ce9ef..e889a8ed22ce5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectBasicMessageBodyWriter.java @@ -6,10 +6,10 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import io.vertx.core.json.JsonObject; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java index 365ae79cd4be8..37db36f11a807 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java @@ -11,9 +11,9 @@ import java.util.Optional; import java.util.Set; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractPersonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractPersonResource.java index af78305f2bae9..00bb0ab2d3d51 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractPersonResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractPersonResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.jackson.deployment.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; abstract class AbstractPersonResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java index 7cc108929dff1..f8ff594d9bc7a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.jackson.deployment.test; -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("cheese") public class CheeseEndpoint { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContextResolverTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContextResolverTest.java index e65167a7153c8..079b5c1753056 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContextResolverTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ContextResolverTest.java @@ -6,10 +6,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CustomJsonProviderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CustomJsonProviderTest.java index ef9fd13b37427..40ad6b4fffb11 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CustomJsonProviderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CustomJsonProviderTest.java @@ -9,14 +9,14 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -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.MediaType; -import javax.ws.rs.core.MultivaluedMap; -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.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/DetailedExceptionInReaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/DetailedExceptionInReaderTest.java index 29855c783f46f..0c5d3cec75169 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/DetailedExceptionInReaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/DetailedExceptionInReaderTest.java @@ -4,11 +4,11 @@ import java.util.function.Supplier; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/EmptyInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/EmptyInputTest.java index aeed5ddac769a..d0008d85601bb 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/EmptyInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/EmptyInputTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderWithCustomMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderWithCustomMapperTest.java index 3cbb995672f63..3f81433845e81 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderWithCustomMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderWithCustomMapperTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java index 4c4c183f5923f..71253d5ba82cd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.ws.rs.FormParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java index 6271bbd4f8e79..3fd6739b6b5d7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.jackson.deployment.test; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("fromage") public class FroMageEndpoint { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MessageBodyReaderTests.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MessageBodyReaderTests.java index eaa5ec0f8bb30..d4e1238aadc60 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MessageBodyReaderTests.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MessageBodyReaderTests.java @@ -12,11 +12,11 @@ import java.util.List; import java.util.Objects; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.CompletionCallback; -import javax.ws.rs.container.ConnectionCallback; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.ConnectionCallback; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.providers.serialisers.AbstractJsonMessageBodyReader; import org.jboss.resteasy.reactive.server.jackson.JacksonBasicMessageBodyReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java index e36389025e9de..6c7ff2a622a6e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java @@ -4,14 +4,14 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java index 53ecc04fe1b1e..114ddd95f5c62 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.ReaderInterceptorContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.ReaderInterceptorContext; @Provider public class NoopReaderInterceptor implements ReaderInterceptor { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/OtherPersonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/OtherPersonResource.java index 4a2985ba667e8..de19ebbf65f78 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/OtherPersonResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/OtherPersonResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.jackson.deployment.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.resteasy.reactive.jackson.DisableSecureSerialization; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java index 2bf5dde005981..7f5abadd4cc69 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.jackson.deployment.test; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonView; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java index d76704b01e1d5..818810a7047c0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java @@ -8,17 +8,17 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiFunction; -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.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +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.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/StreamingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/StreamingTest.java index 89428bf21f704..7b5e6a6a7d329 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/StreamingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/StreamingTest.java @@ -2,10 +2,10 @@ import static io.restassured.RestAssured.when; -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.hamcrest.CoreMatchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java index 01a0afa487b4d..43ed7326f5356 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -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; public class SuperClass { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java index f2341527cd385..c8052f728476a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java @@ -2,11 +2,11 @@ import java.util.Collections; -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 io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/ResponseStringNonAsciiTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/ResponseStringNonAsciiTest.java index ae0d65a6bdbee..3b088e7b0b973 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/ResponseStringNonAsciiTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/ResponseStringNonAsciiTest.java @@ -2,11 +2,11 @@ import java.util.function.Supplier; -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.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/RestResponseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/RestResponseResource.java index 28e85bde70e12..2471e9daa76f1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/RestResponseResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/response/RestResponseResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.jackson.deployment.test.response; -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.RestResponse; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java index fd5c2b81a72d1..b6a32a40456d0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamResource.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.UUID; -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.sse.Sse; -import javax.ws.rs.sse.SseBroadcaster; -import javax.ws.rs.sse.SseEventSink; +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.sse.Sse; +import jakarta.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.reactive.RestStreamElementType; import org.jboss.resteasy.reactive.common.util.RestMediaType; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java index 215a4101a087c..7414d57504e3a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/streams/StreamTestCase.java @@ -14,12 +14,12 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.sse.InboundSseEvent; -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.HttpHeaders; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.SseEventSource; import org.apache.http.HttpStatus; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/SecureField.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/SecureField.java index 47355206c2a33..68da63ad07952 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/SecureField.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/SecureField.java @@ -12,7 +12,7 @@ * then return type when serialized to JSON, * will not include fields whose security requirements match the current user's security scope. * - * Warning: This annotation does not work when placed on a JAX-RS method that returns {@link javax.ws.rs.core.Response}. + * Warning: This annotation does not work when placed on a JAX-RS method that returns {@link jakarta.ws.rs.core.Response}. * Users that wish to use the feature and have the ability to configure the response of the JAX-RS method are advised to * use {@link org.jboss.resteasy.reactive.RestResponse}. */ diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/DefaultMismatchedInputException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/DefaultMismatchedInputException.java index f35e68b7f6605..7496091dace75 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/DefaultMismatchedInputException.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/DefaultMismatchedInputException.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.exc.InvalidFormatException; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/NativeInvalidDefinitionExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/NativeInvalidDefinitionExceptionMapper.java index 7c52170efe3ab..9e7180f52afd2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/NativeInvalidDefinitionExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/mappers/NativeInvalidDefinitionExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.jackson.runtime.mappers; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/BasicServerJacksonMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/BasicServerJacksonMessageBodyWriter.java index c45a76407a6fb..48bfd7cfe7eba 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/BasicServerJacksonMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/BasicServerJacksonMessageBodyWriter.java @@ -9,10 +9,10 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyWriter.java index 67c59f418b20f..2d9ced7de82a4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/FullyFeaturedServerJacksonMessageBodyWriter.java @@ -14,12 +14,12 @@ import java.util.function.BiFunction; import java.util.function.Function; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Providers; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Providers; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/ServerJacksonMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/ServerJacksonMessageBodyReader.java index 755eb1997c913..1064ff509e28e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/ServerJacksonMessageBodyReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/ServerJacksonMessageBodyReader.java @@ -5,11 +5,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.util.StreamUtil; import org.jboss.resteasy.reactive.server.jackson.JacksonBasicMessageBodyReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java index 4de7d14949ad2..e47b3b99f0251 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java index 7f69733c4591c..956901486da12 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java index 2f57cdccb00e8..42f6ef06474a2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java index fab40454691fe..426f5258378bf 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java @@ -6,9 +6,9 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/main/java/io/quarkus/resteasy/reactive/jaxb/deployment/ResteasyReactiveJaxbProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/main/java/io/quarkus/resteasy/reactive/jaxb/deployment/ResteasyReactiveJaxbProcessor.java index 0e723c783f3b3..d70d4e0bf018a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/main/java/io/quarkus/resteasy/reactive/jaxb/deployment/ResteasyReactiveJaxbProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/main/java/io/quarkus/resteasy/reactive/jaxb/deployment/ResteasyReactiveJaxbProcessor.java @@ -8,9 +8,9 @@ import java.util.Locale; import java.util.Set; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java index 514c9267b4cbf..5ba9cf5474ea7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/EmptyInputTest.java @@ -2,10 +2,10 @@ import static org.hamcrest.Matchers.equalTo; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/MultipartTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/MultipartTest.java index 07b180f69827e..9f677096e918f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/MultipartTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/MultipartTest.java @@ -6,14 +6,14 @@ import java.io.IOException; import java.nio.file.Files; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +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.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java index 675b19200347f..032195f80c713 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SimpleXmlTest.java @@ -6,20 +6,20 @@ import java.io.StringWriter; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -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.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.MediaType; -import javax.xml.bind.JAXB; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +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.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MediaType; +import jakarta.xml.bind.JAXB; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java index a3d966d2e55ab..66a01b44697cd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/deployment/src/test/java/io/quarkus/resteasy/reactive/jaxb/deployment/test/SseResourceTest.java @@ -15,27 +15,27 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -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.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.sse.InboundSseEvent; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseBroadcaster; -import javax.ws.rs.sse.SseEventSink; -import javax.ws.rs.sse.SseEventSource; -import javax.xml.bind.JAXB; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +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.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.sse.SseEventSource; +import jakarta.xml.bind.JAXB; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.jboss.resteasy.reactive.RestStreamElementType; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyReader.java index bddb11db1c872..0bb63544e8143 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyReader.java @@ -5,15 +5,16 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; + import org.jboss.resteasy.reactive.common.util.StreamUtil; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyWriter.java index 550c65f1d0528..e96489b077a75 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jaxb/runtime/src/main/java/io/quarkus/resteasy/reactive/jaxb/runtime/serialisers/ServerJaxbMessageBodyWriter.java @@ -7,17 +7,18 @@ import java.lang.reflect.Type; import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.namespace.QName; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.annotation.XmlRootElement; + import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java index 1c5c4a70741da..b8a8999c23261 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/deployment/ResteasyReactiveJsonbCommonProcessor.java @@ -3,8 +3,8 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.util.RestMediaType; import org.jboss.resteasy.reactive.server.jsonb.JsonbMessageBodyReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/runtime/serialisers/VertxJson.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/runtime/serialisers/VertxJson.java index b1a8a23f76085..d0068bef616b6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/runtime/serialisers/VertxJson.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb-common/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/common/runtime/serialisers/VertxJson.java @@ -2,14 +2,14 @@ import java.lang.reflect.Type; -import javax.json.JsonNumber; -import javax.json.JsonValue; -import javax.json.bind.serializer.DeserializationContext; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; -import javax.json.stream.JsonParser; +import jakarta.json.JsonNumber; +import jakarta.json.JsonValue; +import jakarta.json.bind.serializer.DeserializationContext; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; +import jakarta.json.stream.JsonParser; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; @@ -26,7 +26,7 @@ private VertxJson() { } - public static void copy(JsonObject object, javax.json.JsonObject origin) { + public static void copy(JsonObject object, jakarta.json.JsonObject origin) { origin.keySet().forEach(key -> { JsonValue value = origin.get(key); JsonValue.ValueType kind = value.getValueType(); @@ -68,7 +68,7 @@ public static void copy(JsonObject object, javax.json.JsonObject origin) { }); } - public static void copy(JsonArray array, javax.json.JsonArray origin) { + public static void copy(JsonArray array, jakarta.json.JsonArray origin) { for (int i = 0; i < origin.size(); i++) { JsonValue value = origin.get(i); JsonValue.ValueType kind = value.getValueType(); diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java index 64046a86364c5..fcaed58b07e6c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/ResteasyReactiveJsonbProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.jsonb.deployment; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; import io.quarkus.deployment.Feature; import io.quarkus.deployment.annotations.BuildProducer; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java index 6955c935dc53f..ad40ddb125b48 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.jsonb.deployment.test; -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("cheese") public class CheeseEndpoint { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/EmptyInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/EmptyInputTest.java index 1247f51564139..1355981f4c920 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/EmptyInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/EmptyInputTest.java @@ -4,9 +4,9 @@ import java.util.function.Supplier; -import javax.json.bind.annotation.JsonbCreator; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.json.bind.annotation.JsonbCreator; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/MultipartOutputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/MultipartOutputTest.java index 0a6a7cfcd8f2b..2f4e5f2d5a53b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/MultipartOutputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/MultipartOutputTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -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.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java index 5c02da8ac86e3..663ebe8d5ce07 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.jsonb.deployment.test; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class Person { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java index 32f74ca365fac..93e3676ab6115 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; -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.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +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.Produces; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.runtime.BlockingOperationControl; import io.smallrye.common.annotation.NonBlocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/StreamingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/StreamingTest.java index e1e8bfb32f285..0a2866221d12e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/StreamingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/StreamingTest.java @@ -2,10 +2,10 @@ import static io.restassured.RestAssured.when; -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.hamcrest.CoreMatchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java index 0d273996f3b90..d81c459acd152 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -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; public class SuperClass { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java index 619a6a8c4bf55..d6d5f22f2e6fa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java @@ -2,11 +2,11 @@ import java.util.Collections; -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 io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java index 9584c5efd89f1..6b55e2a725a56 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.ws.rs.sse.InboundSseEvent; -import javax.ws.rs.sse.SseEvent; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.SseEvent; import org.jboss.resteasy.reactive.client.impl.InboundSseEventImpl; import org.jboss.resteasy.reactive.client.impl.SseEventSourceImpl; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java index 83a02a7901269..cb61f52aca63d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java @@ -2,13 +2,13 @@ import java.io.IOException; -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.sse.Sse; -import javax.ws.rs.sse.SseBroadcaster; -import javax.ws.rs.sse.SseEventSink; +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.sse.Sse; +import jakarta.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.SseEventSink; // Using `@RestStreamElementType` on purpose to ensure the backward compatibility. import org.jboss.resteasy.reactive.RestSseElementType; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java index 8d36e04781214..442e140cfa976 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java @@ -14,13 +14,13 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.json.bind.JsonbBuilder; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.sse.InboundSseEvent; -import javax.ws.rs.sse.SseEventSource; +import jakarta.json.bind.JsonbBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.SseEventSource; import org.apache.http.HttpStatus; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt index d66d4a77caf44..708e02079679c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/CustomBeanTest.kt @@ -9,9 +9,9 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.enterprise.inject.Produces -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.enterprise.inject.Produces +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.full.createType class CustomBeanTest { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt index 21eddd14c26ef..a80d9930cdc1d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/deployment/src/test/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/JsonBuilderCustomizerTest.kt @@ -10,9 +10,9 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.annotation.Priority -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.annotation.Priority +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.full.createType class JsonBuilderCustomizerTest { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonProducer.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonProducer.kt index b139e6364c6b1..09c24b4b80235 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonProducer.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization-common/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/common/runtime/JsonProducer.kt @@ -3,10 +3,10 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.common.runtime import io.quarkus.arc.All import io.quarkus.arc.DefaultBean import io.quarkus.resteasy.reactive.kotlin.serialization.common.JsonBuilderCustomizer +import jakarta.enterprise.inject.Produces +import jakarta.inject.Singleton import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json -import javax.enterprise.inject.Produces -import javax.inject.Singleton @Singleton class JsonProducer { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/resteasy/reactive/kotlin/serialization/deployment/KotlinSerializationProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/resteasy/reactive/kotlin/serialization/deployment/KotlinSerializationProcessor.java index f5352d2627e02..b11780c04f24f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/resteasy/reactive/kotlin/serialization/deployment/KotlinSerializationProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/resteasy/reactive/kotlin/serialization/deployment/KotlinSerializationProcessor.java @@ -5,9 +5,9 @@ import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyReader.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyReader.kt index 07b0e82bc0f6b..083423c49c6ab 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyReader.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyReader.kt @@ -1,5 +1,7 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.runtime +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.MultivaluedMap import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream @@ -11,8 +13,6 @@ import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader import org.jboss.resteasy.reactive.server.spi.ServerRequestContext import java.io.InputStream import java.lang.reflect.Type -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.MultivaluedMap class KotlinSerializationMessageBodyReader(private val json: Json) : AbstractJsonMessageBodyReader(), ServerMessageBodyReader { override fun isReadable(type: Class<*>, genericType: Type, annotations: Array?, mediaType: MediaType) = diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyWriter.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyWriter.kt index a21f8be8cd358..12918ea946d9c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyWriter.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/resteasy/reactive/kotlin/serialization/runtime/KotlinSerializationMessageBodyWriter.kt @@ -1,5 +1,8 @@ package io.quarkus.resteasy.reactive.kotlin.serialization.runtime +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.MultivaluedMap import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.encodeToStream @@ -10,9 +13,6 @@ import org.jboss.resteasy.reactive.server.spi.ServerRequestContext import java.io.OutputStream import java.lang.reflect.Type import java.nio.charset.StandardCharsets -import javax.ws.rs.Produces -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.MultivaluedMap @Produces("application/json", "application/*+json", "text/json") @OptIn(ExperimentalSerializationApi::class) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/AbstractSuspendedResponseFilter.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/AbstractSuspendedResponseFilter.kt index 46cb5206a638c..22e76aee8cc33 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/AbstractSuspendedResponseFilter.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/AbstractSuspendedResponseFilter.kt @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.runtime.kotlin +import jakarta.ws.rs.container.ContainerResponseContext import kotlinx.coroutines.launch import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerResponseFilter -import javax.ws.rs.container.ContainerResponseContext /** * Base class used by Quarkus to generate an implementation at build-time that calls diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/ApplicationCoroutineScope.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/ApplicationCoroutineScope.kt index 5616f89ed3ab7..9edaa9bea43a4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/ApplicationCoroutineScope.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/ApplicationCoroutineScope.kt @@ -1,6 +1,8 @@ package org.jboss.resteasy.reactive.server.runtime.kotlin import io.vertx.core.Context +import jakarta.annotation.PreDestroy +import jakarta.inject.Singleton import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Runnable @@ -9,8 +11,6 @@ import kotlinx.coroutines.cancel import org.jboss.resteasy.reactive.server.core.CurrentRequestManager import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext import org.jboss.resteasy.reactive.spi.ThreadSetupAction -import javax.annotation.PreDestroy -import javax.inject.Singleton import kotlin.coroutines.CoroutineContext /** diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandlerFactory.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandlerFactory.kt index 1446af6ccd552..19756493c6a7c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandlerFactory.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineInvocationHandlerFactory.kt @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.runtime.kotlin import io.quarkus.arc.Unremovable +import jakarta.inject.Singleton import org.jboss.resteasy.reactive.server.spi.EndpointInvoker import org.jboss.resteasy.reactive.server.spi.ServerRestHandler -import javax.inject.Singleton /** * Factory for the [CoroutineInvocationHandler] that is already part of the CDI container diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineMethodProcessor.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineMethodProcessor.kt index 01ab7ac4d6be5..2b47cdcb18d99 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineMethodProcessor.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/CoroutineMethodProcessor.kt @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.runtime.kotlin +import jakarta.enterprise.inject.spi.CDI import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer import org.jboss.resteasy.reactive.server.model.ServerResourceMethod import org.jboss.resteasy.reactive.server.spi.EndpointInvoker import org.jboss.resteasy.reactive.server.spi.ServerRestHandler import java.util.function.Supplier -import javax.enterprise.inject.spi.CDI /** * Intercepts method invocations to force an EndpointInvoker. diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/FlowToPublisherHandler.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/FlowToPublisherHandler.kt index 824202de6e0e6..bc28f858c7f68 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/FlowToPublisherHandler.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/FlowToPublisherHandler.kt @@ -2,13 +2,13 @@ package org.jboss.resteasy.reactive.server.runtime.kotlin import io.smallrye.mutiny.coroutines.asMulti import io.vertx.core.Vertx +import jakarta.enterprise.inject.spi.CDI import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext import org.jboss.resteasy.reactive.server.spi.ServerRestHandler import java.util.concurrent.Executor -import javax.enterprise.inject.spi.CDI class FlowToPublisherHandler : ServerRestHandler { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/PrepareExecution.kt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/PrepareExecution.kt index 03d711dd2adfc..2443d660e5aad 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/PrepareExecution.kt +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/runtime/src/main/kotlin/org/jboss/resteasy/reactive/server/runtime/kotlin/PrepareExecution.kt @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.runtime.kotlin import io.vertx.core.Vertx +import jakarta.enterprise.inject.spi.CDI import kotlinx.coroutines.CoroutineDispatcher import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext -import javax.enterprise.inject.spi.CDI fun prepareExecution(requestContext: ResteasyReactiveRequestContext): Pair { val requestScope = requestContext.captureCDIRequestScope() diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java index 452b527ccb1e1..5081617941c73 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java index 294455f406f1f..e7009c35a5c62 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/RestLinksInjectionTest.java @@ -5,8 +5,8 @@ import java.util.List; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.UriBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/TestResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/TestResource.java index 09191fa2cad08..cbfd69aa57159 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/TestResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/test/java/io/quarkus/resteasy/reactive/links/deployment/TestResource.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -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.NotFoundException; +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.common.util.RestMediaType; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java index 5f21d42bc9785..421cc5ed87a61 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksProvider.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksProvider.java index b2e7cc3f8d2f4..72693698ea9aa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksProvider.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksProvider.java @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; /** * An injectable bean that contains methods to get the web links at class and instance levels. diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/LinksContainer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/LinksContainer.java index fd2d1d4f1ecb2..5ddfb10390bc7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/LinksContainer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/LinksContainer.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.util.MultivaluedTreeMap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java index 18d9f58511be1..f29ccc56c1710 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.List; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.resteasy.reactive.links.RestLinksProvider; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderProducer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderProducer.java index a2119687f984e..6914e75490781 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderProducer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderProducer.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.links.runtime; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.ws.rs.core.UriInfo; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.arc.DefaultBean; import io.quarkus.resteasy.reactive.links.RestLinksProvider; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/HalServerResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/HalServerResponseFilter.java index d537eb3741843..8e60ed5c1398b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/HalServerResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/HalServerResponseFilter.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.util.RestMediaType; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/ResteasyReactiveHalService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/ResteasyReactiveHalService.java index 7840131160a9a..c7a58fa36e1d0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/ResteasyReactiveHalService.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/hal/ResteasyReactiveHalService.java @@ -4,9 +4,9 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.core.Link; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Link; import io.quarkus.hal.HalLink; import io.quarkus.hal.HalService; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java index e710f541501a3..fab22d0d3a906 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java @@ -2,11 +2,11 @@ import java.util.Locale; -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.qute.Template; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java index d635cbe214ed2..f67ae5033c32d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java @@ -2,13 +2,13 @@ import java.util.Map; -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 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.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java index e4ab08e1c5844..b1e402f13d839 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.qute.deployment; -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.qute.CheckedTemplate; import io.quarkus.qute.Template; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java index 42f9b22832f83..7986315952e04 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import io.quarkus.qute.CheckedTemplate; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateInstanceNonBlockingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateInstanceNonBlockingTest.java index 4f4765bb68600..d1fb7c35fc321 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateInstanceNonBlockingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateInstanceNonBlockingTest.java @@ -3,11 +3,11 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; -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.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java index 05753de0cc286..46160dc08534e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.qute.deployment; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.qute.CheckedTemplate; import io.quarkus.qute.TemplateInstance; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java index f82d62ac5570a..e9202ba812b05 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java @@ -3,9 +3,9 @@ import static io.quarkus.resteasy.reactive.qute.runtime.Util.setSelectedVariant; import static io.quarkus.resteasy.reactive.qute.runtime.Util.toUni; -import javax.inject.Inject; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.server.ServerResponseFilter; @@ -16,7 +16,7 @@ import io.smallrye.mutiny.Uni; /** - * This class is needed in order to support handling {@link javax.ws.rs.core.Response} that contains a TemplateInstance... + * This class is needed in order to support handling {@link jakarta.ws.rs.core.Response} that contains a TemplateInstance... */ public class TemplateResponseFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java index ebf2667b44554..cf2be4a3d25ec 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java @@ -3,7 +3,7 @@ import static io.quarkus.resteasy.reactive.qute.runtime.Util.*; import static io.quarkus.resteasy.reactive.qute.runtime.Util.toUni; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/Util.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/Util.java index 57b5ce52bd883..ba407a7c0b1ca 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/Util.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/Util.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Locale; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; import io.quarkus.qute.Engine; import io.quarkus.qute.TemplateException; @@ -36,12 +36,12 @@ static MediaType setSelectedVariant(TemplateInstance result, Object variantsAttr = result.getAttribute(TemplateInstance.VARIANTS); if (variantsAttr != null) { List quteVariants = (List) variantsAttr; - List jaxRsVariants = new ArrayList<>(quteVariants.size()); + List jaxRsVariants = new ArrayList<>(quteVariants.size()); for (Variant variant : quteVariants) { - jaxRsVariants.add(new javax.ws.rs.core.Variant(MediaType.valueOf(variant.getMediaType()), variant.getLocale(), + jaxRsVariants.add(new jakarta.ws.rs.core.Variant(MediaType.valueOf(variant.getMediaType()), variant.getLocale(), variant.getEncoding())); } - javax.ws.rs.core.Variant selected = request + jakarta.ws.rs.core.Variant selected = request .selectVariant(jaxRsVariants); if (selected != null) { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java index 24d975f8d12c9..e08cc7f41cd83 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java @@ -2,8 +2,8 @@ import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; -import javax.servlet.DispatcherType; -import javax.ws.rs.core.Application; +import jakarta.servlet.DispatcherType; +import jakarta.ws.rs.core.Application; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java index 2f09a797de3c6..da554bb66c6c8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java index aa126a3b7dfd3..eb4ee11480aa8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java index b599c20bf7d68..f94dc06080235 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.servlet.runtime; -import javax.servlet.Filter; -import javax.servlet.Servlet; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; import org.jboss.resteasy.reactive.server.core.Deployment; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java index 43f562f444e85..8aab366d0b14a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java @@ -16,15 +16,15 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.enterprise.event.Event; -import javax.servlet.AsyncContext; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.SecurityContext; +import jakarta.enterprise.event.Event; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.SecurityContext; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java index 10c42bacac222..cbda7b6d86137 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.servlet.runtime; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.core.RequestContextFactory; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java index 1d432c170b093..8cff217a4bf3f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java @@ -4,7 +4,7 @@ import java.io.InputStream; import java.nio.ByteBuffer; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class ServletResteasyReactiveInputStream extends InputStream { ByteBuffer existingData; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java index 600dc62fc03da..b141f654df785 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java @@ -7,9 +7,9 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java index d82e0dfd0ada1..8618b225b8570 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/FilterClassIntrospector.java @@ -4,7 +4,7 @@ import java.io.InputStream; import java.io.UncheckedIOException; -import javax.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.container.ResourceInfo; import org.jboss.jandex.MethodInfo; import org.objectweb.asm.ClassReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java index 3395f4433b067..fabd174fc23e8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MessageBodyWriterTransformerUtils.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.objectweb.asm.ClassReader; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusMultipartReturnTypeHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusMultipartReturnTypeHandler.java index 5c309395931ee..e171957996e26 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusMultipartReturnTypeHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusMultipartReturnTypeHandler.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.function.Predicate; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java index 6923affbcca72..62181bcb5d575 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.function.Predicate; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java index b85fcad8a7a7f..c6a3ab0ec1d87 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Optional; -import javax.ws.rs.BeanParam; +import jakarta.ws.rs.BeanParam; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java index ca8dd87631198..a3b5dc98d6f2d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java @@ -33,19 +33,19 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.Consumes; -import javax.ws.rs.Priorities; -import javax.ws.rs.Produces; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Providers; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Providers; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; @@ -895,7 +895,7 @@ private void handleDateFormatReflection(BuildProducer } /** - * RESTEasy Classic also includes the providers that are set in the 'META-INF/services/javax.ws.rs.ext.Providers' file + * RESTEasy Classic also includes the providers that are set in the 'META-INF/services/jakarta.ws.rs.ext.Providers' file * This is not a ServiceLoader call, but essentially provides the same functionality. */ @BuildStep diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java index 42d5b78e2d8b9..d3003cb19a3aa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java @@ -13,8 +13,8 @@ import java.util.Set; import java.util.function.Consumer; -import javax.transaction.RollbackException; -import javax.ws.rs.Priorities; +import jakarta.transaction.RollbackException; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/SecurityTransformerUtils.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/SecurityTransformerUtils.java index 9a9ef2d9c0602..df1fd4b448a32 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/SecurityTransformerUtils.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/SecurityTransformerUtils.java @@ -5,9 +5,9 @@ import java.util.Optional; import java.util.Set; -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.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java index 7422abdd34ec1..d0e5a35d31507 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java @@ -4,12 +4,12 @@ import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnApplicationTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnApplicationTest.java index dffe8aca18275..cce3316d6944b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnApplicationTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnApplicationTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnClassTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnClassTest.java index dafd14a08adae..c7a932b27c35f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnClassTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnClassTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnMethodTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnMethodTest.java index 0cb2def5be083..7befc3f3c782f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnMethodTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/BothBlockingAndNonBlockingOnMethodTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/CustomNonBlockingReturnTypeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/CustomNonBlockingReturnTypeTest.java index 8a8813442dfbf..b2c95b7836c4b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/CustomNonBlockingReturnTypeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/CustomNonBlockingReturnTypeTest.java @@ -10,12 +10,12 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.jandex.DotName; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/EndpointDisabledTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/EndpointDisabledTest.java index 02f89968e9887..f5ff72ec538c7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/EndpointDisabledTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/EndpointDisabledTest.java @@ -3,8 +3,8 @@ import static io.restassured.RestAssured.*; import static org.hamcrest.CoreMatchers.equalTo; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java index 1513476f85ecf..ddf5b937cf225 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleApplicationClassesWithBuildProfileTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleApplicationClassesWithBuildProfileTest.java index 3db55b97b2326..952f1f95b11f0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleApplicationClassesWithBuildProfileTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleApplicationClassesWithBuildProfileTest.java @@ -2,10 +2,10 @@ import static io.restassured.RestAssured.get; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java index a74af04fe9c3d..ade086c93b420 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestLeakDetectionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestLeakDetectionTest.java index b62fe45b9a2f8..a073243d26360 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestLeakDetectionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestLeakDetectionTest.java @@ -9,12 +9,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedFieldInjectionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedFieldInjectionTest.java index 633c279f742b5..28db0231c3f5c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedFieldInjectionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedFieldInjectionTest.java @@ -4,11 +4,11 @@ import java.util.function.Supplier; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestPath; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedParamConverterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedParamConverterTest.java index 375404bf7df79..1e72cb1292a52 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedParamConverterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/RequestScopedParamConverterTest.java @@ -4,11 +4,11 @@ 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 org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/SubResourcesAsBeansTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/SubResourcesAsBeansTest.java index c3148f50f3970..20767bbb3c741 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/SubResourcesAsBeansTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/SubResourcesAsBeansTest.java @@ -4,10 +4,10 @@ import java.util.function.Consumer; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.HttpHeaders; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.HttpHeaders; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestPath; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/BeanParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/BeanParamTest.java index 85a739e30b75a..bbfe2701f0178 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/BeanParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/BeanParamTest.java @@ -1,13 +1,13 @@ package io.quarkus.resteasy.reactive.server.test.beanparam; -import javax.ws.rs.BeanParam; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/CustomConverterInBeanParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/CustomConverterInBeanParamTest.java index 9573dcd9049c3..0d0806010496a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/CustomConverterInBeanParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/CustomConverterInBeanParamTest.java @@ -7,15 +7,15 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import javax.ws.rs.BeanParam; -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.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BeanParam; +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.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithAnnotationsInAMethodOfBeanParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithAnnotationsInAMethodOfBeanParamTest.java index 9bf8c62435a2f..4c360452bdcaa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithAnnotationsInAMethodOfBeanParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithAnnotationsInAMethodOfBeanParamTest.java @@ -1,12 +1,12 @@ package io.quarkus.resteasy.reactive.server.test.beanparam; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.BeanParam; -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.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.BeanParam; +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.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithNoAnnotationsInBeanParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithNoAnnotationsInBeanParamTest.java index 2a8b1e83f504d..62f899df9177a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithNoAnnotationsInBeanParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/FailWithNoAnnotationsInBeanParamTest.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.beanparam; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/NestedBeanParamInSubResourcesTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/NestedBeanParamInSubResourcesTest.java index 3d8e3418f53c2..a9c9aaba651f1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/NestedBeanParamInSubResourcesTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/beanparam/NestedBeanParamInSubResourcesTest.java @@ -2,12 +2,12 @@ import static org.hamcrest.CoreMatchers.equalTo; -import javax.ws.rs.BeanParam; -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.BeanParam; +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.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnClassAndMethodsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnClassAndMethodsTest.java index 95a0a88b91ec6..3c9ef29349420 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnClassAndMethodsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnClassAndMethodsTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -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.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnMethodsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnMethodsTest.java index d97eb5a38339f..d77fa95f6f0d8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnMethodsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/CacheOnMethodsTest.java @@ -5,8 +5,8 @@ import java.util.function.Supplier; -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.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnClassAndMethodsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnClassAndMethodsTest.java index d51b955e4f322..2617f8a57bdef 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnClassAndMethodsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnClassAndMethodsTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -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.NoCache; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java index b3197a87c1357..4fcad583e1d8b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java @@ -5,8 +5,8 @@ import java.util.function.Supplier; -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.NoCache; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/compress/CompressionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/compress/CompressionTest.java index 0c5bf4ef2ce61..0ca7f3eba648e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/compress/CompressionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/compress/CompressionTest.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ConditionalExceptionMappersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ConditionalExceptionMappersTest.java index 31c3270b60806..2b7c21bffe504 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ConditionalExceptionMappersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ConditionalExceptionMappersTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java index 59bcada55af2f..d04abc326e280 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java @@ -2,14 +2,14 @@ import static io.quarkus.resteasy.reactive.server.test.ExceptionUtil.removeStackTrace; -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.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +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.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/GlobalThrowableExceptionMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/GlobalThrowableExceptionMapperTest.java index 36b245c96a9cf..5521309bc0d65 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/GlobalThrowableExceptionMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/GlobalThrowableExceptionMapperTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git "a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/InvalidConditional\316\234appersTest.java" "b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/InvalidConditional\316\234appersTest.java" index 08cb2f23ae8fc..6182aed1b58dd 100644 --- "a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/InvalidConditional\316\234appersTest.java" +++ "b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/InvalidConditional\316\234appersTest.java" @@ -5,9 +5,9 @@ import java.util.function.Supplier; -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.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java index 0a1c98478e940..1940b46cec857 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.customexceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/PerClassThrowableExceptionMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/PerClassThrowableExceptionMapperTest.java index 78c99db394d52..b817530270167 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/PerClassThrowableExceptionMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/PerClassThrowableExceptionMapperTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java index 6a92fe1a916db..4bf4e772f5b8a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java @@ -2,9 +2,9 @@ import static io.quarkus.resteasy.reactive.server.test.ExceptionUtil.removeStackTrace; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("second") public class SecondResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecurityExceptionMapperWithResourceInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecurityExceptionMapperWithResourceInfoTest.java index 0eb03f18d6ea0..b38bf2c1179a3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecurityExceptionMapperWithResourceInfoTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecurityExceptionMapperWithResourceInfoTest.java @@ -4,12 +4,12 @@ import java.util.function.Supplier; -import javax.annotation.security.DenyAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.DenyAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java index 1810de1ee9a11..a46b03e7c95f9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.customexceptions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class SomeBean { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java index 127ccd6dde728..ee5f1e771f520 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.customexceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UnwrappedExceptionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UnwrappedExceptionTest.java index 44325f8175fa3..14664493ff7a7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UnwrappedExceptionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UnwrappedExceptionTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AnotherValidNonBlockingFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AnotherValidNonBlockingFiltersTest.java index ab5880493cbf8..3a78519fa9301 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AnotherValidNonBlockingFiltersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AnotherValidNonBlockingFiltersTest.java @@ -5,19 +5,19 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java index 7260ef9f400dd..827d651c47867 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java @@ -5,10 +5,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Request; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Request; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ConditionalBeanFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ConditionalBeanFiltersTest.java index e1822c0da4553..70e1cdbdc781c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ConditionalBeanFiltersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ConditionalBeanFiltersTest.java @@ -9,14 +9,14 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java index a8cb35b49f93d..1a7212d257807 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java index bab2ffa503052..15599efeac8cc 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java index 6d304cfd13cb1..175384bfbcacd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -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.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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; @Path("/custom") public class CustomFiltersResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/FilterWithPathParamsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/FilterWithPathParamsTest.java index 8ca89f3494238..fa087217a8bd7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/FilterWithPathParamsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/FilterWithPathParamsTest.java @@ -6,10 +6,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java index ccf1cf947b68b..443b2c5de6e86 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class IllegalStateExceptionMapper implements ExceptionMapper { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ImpliedReadBodyRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ImpliedReadBodyRequestFilterTest.java index 605cb4677e18b..bc790e2866a76 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ImpliedReadBodyRequestFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ImpliedReadBodyRequestFilterTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.HttpHeaders; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidConditionalBeanFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidConditionalBeanFiltersTest.java index b101b18929538..a8b0d4fef3368 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidConditionalBeanFiltersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidConditionalBeanFiltersTest.java @@ -5,9 +5,9 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidNonBlockingFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidNonBlockingFiltersTest.java index 4f614191d4b75..29101a03de4b2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidNonBlockingFiltersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/InvalidNonBlockingFiltersTest.java @@ -5,14 +5,14 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java index 77ecdd13b77d6..d094748c2e6fb 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.TYPE, ElementType.METHOD }) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java index 62335776d3343..c436a8489dc13 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java index 4d2bb9a21e58d..a1f3874752730 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java @@ -5,16 +5,16 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java index bcac985db195e..1bf6783b639d2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionsRequestTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionsRequestTest.java index 6c7acbbd94d11..c21669e05f7e5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionsRequestTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionsRequestTest.java @@ -8,9 +8,9 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerResponseContext; import org.assertj.core.api.Assertions; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/PreMatchingHeadersFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/PreMatchingHeadersFilterTest.java index 25f203132763f..e575f758887af 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/PreMatchingHeadersFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/PreMatchingHeadersFilterTest.java @@ -6,13 +6,13 @@ import java.util.List; import java.util.function.Supplier; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -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.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ReadBodyRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ReadBodyRequestFilterTest.java index 952260f155988..b2da8e6e809a4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ReadBodyRequestFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ReadBodyRequestFilterTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.HttpHeaders; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java index c0d9ee29a9e6e..af1cb3ed0a0f3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java index 2ce396ebb6bbd..842c742dd99d2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class SomeBean { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java index 5d6c7d67da507..d0cec3dbf87f3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class UniExceptionMapper implements ExceptionMapper { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java index bb6a3da6e2e4e..34af6cf146dd2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -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.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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; @Path("uni") public class UniFiltersResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java index 0068f1de93bfa..b65d0c5c21a04 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseContext; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java index 27b3e2fe057b7..624c78c72d639 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java index 97f69fc993c50..2dcd0545fcc25 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ValidNonBlockingFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ValidNonBlockingFiltersTest.java index 91a79d0b3232e..fe32696f46758 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ValidNonBlockingFiltersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ValidNonBlockingFiltersTest.java @@ -5,17 +5,17 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/WithFormBodyTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/WithFormBodyTest.java index bc89943ad593a..c7a0a709ae735 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/WithFormBodyTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/WithFormBodyTest.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/devmode/SubResourceDevModeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/devmode/SubResourceDevModeTest.java index e03792c3b9a5c..b335d931fd040 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/devmode/SubResourceDevModeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/devmode/SubResourceDevModeTest.java @@ -4,13 +4,13 @@ import java.util.function.Supplier; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.core.Context; -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.container.ResourceContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource.java index 69bb3fdbc1c36..7831150c4c1d1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.duplicate; -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; @Path("/hello-resteasy") public class GreetingResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource2.java index 38f75455a27c8..83987dbc1420a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource2.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource2.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.duplicate; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("") public class GreetingResource2 { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource3.java index f4a6a20a620f3..593091a9590c8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource3.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/duplicate/GreetingResource3.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.duplicate; -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; @Path("/hello-resteasy") public class GreetingResource3 { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java index 175a16954f767..d6ecdc925c525 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java @@ -4,8 +4,8 @@ import java.util.function.Consumer; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/Dummy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/Dummy.java index 9dded6e3df76a..7510f1d26bc27 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/Dummy.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/Dummy.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.headers; -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.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java index ba10b38bb47a5..eb0f85732cff5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/ResponseHeaderTest.java @@ -7,8 +7,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 org.jboss.resteasy.reactive.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/VertxHeadersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/VertxHeadersTest.java index c2b902c7e2d50..8c7e646778c2a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/VertxHeadersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/headers/VertxHeadersTest.java @@ -5,13 +5,13 @@ import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +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.ext.Provider; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/ContentTypeCaseTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/ContentTypeCaseTest.java index 7698788d50dc9..d930e3787f921 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/ContentTypeCaseTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/ContentTypeCaseTest.java @@ -5,11 +5,11 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/InvalidContentTypeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/InvalidContentTypeTest.java index 8f1c3a64e561d..e9c14e3484427 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/InvalidContentTypeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/InvalidContentTypeTest.java @@ -6,9 +6,9 @@ import java.util.function.Supplier; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/NoAcceptMultipleProducesTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/NoAcceptMultipleProducesTest.java index 592755a67752e..c777dfc9de431 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/NoAcceptMultipleProducesTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/mediatype/NoAcceptMultipleProducesTest.java @@ -12,13 +12,13 @@ import java.util.Map; import java.util.function.Supplier; -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.MediaType; -import javax.ws.rs.core.MultivaluedMap; -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.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java index 14529e614572f..3eae60efae0fe 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java @@ -3,7 +3,7 @@ import java.io.File; import java.nio.file.Path; -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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java index 0a25134a4538a..814db4272b940 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.multipart; -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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataSameFileName.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataSameFileName.java index d8aa98915bcdf..e040cacaff52b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataSameFileName.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataSameFileName.java @@ -4,7 +4,7 @@ import java.nio.file.Path; 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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataWithAllUploads.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataWithAllUploads.java index ba2b27ca7f125..a19e79952ae89 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataWithAllUploads.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataWithAllUploads.java @@ -2,7 +2,7 @@ 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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java index c0557014e9c97..9123523ac6f4c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/InvalidEncodingTest.java @@ -5,12 +5,12 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import javax.ws.rs.BeanParam; -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.BeanParam; +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.jboss.resteasy.reactive.RestForm; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java index f57c3e51f97eb..1616beba439af 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java @@ -9,13 +9,13 @@ import java.nio.file.Files; import java.util.function.Supplier; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MalformedMultipartInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MalformedMultipartInputTest.java index 7c18820ecf6eb..4959af0927efa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MalformedMultipartInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MalformedMultipartInputTest.java @@ -8,17 +8,17 @@ import java.lang.reflect.Type; import java.util.function.Supplier; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -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.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +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.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartDataInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartDataInputTest.java index 5a7da55fdb43d..1638b9d18efc7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartDataInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartDataInputTest.java @@ -13,11 +13,11 @@ import java.util.Map; import java.util.function.Supplier; -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.jboss.resteasy.reactive.server.multipart.FormValue; import org.jboss.resteasy.reactive.server.multipart.MultipartFormDataInput; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputFileResponse.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputFileResponse.java index b5367db24e652..b4f60b596a902 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputFileResponse.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputFileResponse.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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileDownloadResponse.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileDownloadResponse.java index a7f919b19b84f..1aea41681caf6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileDownloadResponse.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileDownloadResponse.java @@ -2,7 +2,7 @@ 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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileResponse.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileResponse.java index ce0c2496ccd93..a881ff952018e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileResponse.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputMultipleFileResponse.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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java index c6864055597e5..083d3f477c0fa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResource.java @@ -5,10 +5,10 @@ import java.io.RandomAccessFile; 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.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.multipart.MultipartFormDataOutput; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResponse.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResponse.java index 6e079364c6ab2..5fb402f0b3804 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResponse.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputResponse.java @@ -2,8 +2,8 @@ import java.util.List; -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.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputSingleFileDownloadResponse.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputSingleFileDownloadResponse.java index 7d09e750add6e..ea1c4a478a22b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputSingleFileDownloadResponse.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputSingleFileDownloadResponse.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.multipart; -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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java index 62881e6efed67..e83b86bf302a8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingReactiveEndpointTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingReactiveEndpointTest.java index a1a7fb1b70879..d1c9c16426ada 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingReactiveEndpointTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartOutputUsingReactiveEndpointTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java index a3958b01ae37a..4a2d1a2d6cf5f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java @@ -5,14 +5,14 @@ import java.nio.file.Files; import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -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.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +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.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResourceWithAllUploads.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResourceWithAllUploads.java index 0f06e28291b8d..050596408b38e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResourceWithAllUploads.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResourceWithAllUploads.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -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.BeanParam; +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.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java index 27549010a8804..605047ba43f7e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.multipart; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; public class OtherFormDataBase { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java index f768414f5d39d..bb1152c8c6ad3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.multipart; -import javax.ws.rs.BeanParam; -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.BeanParam; +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; @Path("/otherMultipart") public class OtherMultipartResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java index f71ef64db649a..9e681556c7d36 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java @@ -9,12 +9,12 @@ import java.nio.file.Paths; import java.util.function.Supplier; -import javax.ws.rs.BeanParam; -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.BeanParam; +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.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java index f0db1e86e3ea6..90a02323bd982 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.multipart.other; -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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java index 900fd9752b11a..98b48d5f25d5a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.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.core.PathSegment; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.PathSegment; /** * Per spec: diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java index 18debb78f1f5b..9d8b56f1bd79e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.path; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java index 79f8b18beb6d7..6d427e3f461d3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileResource.java @@ -3,8 +3,8 @@ import java.io.File; import java.nio.file.Paths; -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.FilePart; import org.jboss.resteasy.reactive.PathPart; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java index 4670039e90755..c9adc3def2c48 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java @@ -7,7 +7,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.FilePart; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileResource.java index 87460972e6001..71f6884a7f9f1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/InvalidFileResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.providers; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.file.AsyncFile; import io.vertx.ext.web.RoutingContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ParamConverterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ParamConverterTest.java index c0c2447d651c7..60c257a094ea9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ParamConverterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ParamConverterTest.java @@ -10,12 +10,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ProviderConfigInjectionTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ProviderConfigInjectionTest.java index 42250dd718a26..4875c1512a780 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ProviderConfigInjectionTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ProviderConfigInjectionTest.java @@ -2,13 +2,13 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.hamcrest.Matchers; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WithWriterInterceptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WithWriterInterceptor.java index 9a71db6868751..9d68b882b0b15 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WithWriterInterceptor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WithWriterInterceptor.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.METHOD, ElementType.TYPE }) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WriterInterceptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WriterInterceptor.java index 4172859a43504..cae816725c8a4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WriterInterceptor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/WriterInterceptor.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.WriterInterceptorContext; @WithWriterInterceptor @Provider -public class WriterInterceptor implements javax.ws.rs.ext.WriterInterceptor { +public class WriterInterceptor implements jakarta.ws.rs.ext.WriterInterceptor { @Override public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java index 66194567050c2..e0578888cc5e0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java @@ -3,14 +3,14 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -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.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java index 3f50b252d4c10..4413bc3bb2237 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; @Provider public class AbortingRequestFilter implements ContainerRequestFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java index 791b146719a93..f2da2a6c2bb9e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java @@ -8,14 +8,14 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -import javax.ws.rs.Consumes; -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.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +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.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java index 2ec2baaa7254a..14ee9776094e7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java index 6a485a0be885d..93049bc34d32e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ContainerRequestContextTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ContainerRequestContextTest.java index 9943372efa324..116e13954f51b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ContainerRequestContextTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ContainerRequestContextTest.java @@ -5,11 +5,11 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java index 962aee861ff6b..22040d42deb1b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java index aab4f7a61973b..a434118763f59 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java @@ -3,12 +3,12 @@ import java.io.ByteArrayOutputStream; import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java index 9fd462023d4a8..40678cf526af2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java index 8c3737fab04e0..5f5a8cd043497 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java index 5b8712e67f08e..1daae9a8c8ffc 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java index 49cd28e1b2c2f..cda6508920086 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java index c20cd298b208e..7810b6a33f2de 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java @@ -2,11 +2,11 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java index 95857595b41f1..8fa390b32c20a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java index 7cd1c400919b1..1e55814fd5020 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java @@ -6,19 +6,19 @@ import java.lang.reflect.Type; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -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.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java index 2e02d3a55e877..fe02751c8b68d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java @@ -6,21 +6,21 @@ import java.lang.reflect.Type; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypesWithSuffixHandlingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypesWithSuffixHandlingTest.java index 4b741ca17e064..8708809f7d1a6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypesWithSuffixHandlingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypesWithSuffixHandlingTest.java @@ -7,14 +7,14 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.Consumes; -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.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +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.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java index a7d3920776da8..600f4653e7699 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java index 9310daf3d8331..05490bcca6578 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.client.ClientBuilder; import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java index df719e57763c7..13e24cee2d887 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java index 12e00444a3850..0ea317fca1a22 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java @@ -5,13 +5,13 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResponseInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResponseInfoTest.java index 7dd534e9c15f6..e40f73601319a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResponseInfoTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResponseInfoTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java index 87afe76813490..283f858e6bdb7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java index ee1eccd41fa89..26b765b9535c5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java index d7e17d47148c0..cef368960d6e4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java @@ -3,15 +3,15 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestPath; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java index 1f35d4e6e595c..950ffba649376 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java @@ -2,11 +2,11 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.hamcrest.Matchers; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java index e7edda1646242..b1e109581c281 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java index fdcc69f595d9e..f10df9d5436d8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ApplicationScopeObject { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java index af256f113946a..d3a263a147fe8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -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("/test") @Produces(MediaType.APPLICATION_JSON) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java index fdad22edc5261..be8be415635d2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -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 jakarta.ws.rs.BeanParam; +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 org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java index 6e29245e45072..0eb7f6aa33406 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; public interface CovariantReturnSubresourceLocatorsRootProxy { @Path("sub/{path}") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java index 5a5754cc135af..6aa2b528ff8c8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; public interface CovariantReturnSubresourceLocatorsSubProxy { @GET diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java index 4662374a832c3..6ab43103a75a8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/path") public class CovariantReturnSubresourceLocatorsSubProxyRootImpl implements CovariantReturnSubresourceLocatorsRootProxy { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java index d2c9553a993ec..37604c3daf7ea 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/") public class DefaultCharsetResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java index bbac524ac79ae..ce9432d6388d7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java @@ -2,12 +2,12 @@ import java.util.Date; -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 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 org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java index 684bef347005d..259ae93e74889 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Locale; -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.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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java index 71d63ad1ecab9..d60c147ed5356 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java @@ -7,12 +7,12 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -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.Produces; +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 org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java index 4f1f63d2109f1..c5584245b4c11 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java @@ -7,12 +7,12 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -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.Produces; +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 org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java index 6442c65c9ac41..7d20c36619c01 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java @@ -7,11 +7,11 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java index 3f075a6f8bbf4..598e5ed4c7431 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; @Path("/") public class GenericEntityResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java index 5b73f1171a34a..4b9b08ce4c619 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; /** * This is a sample of a CRUD resource template which can be reused for different entities. diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java index 1532702e78634..f90638347e1ed 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java @@ -3,9 +3,9 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; /** * RESTEasy should be able to use type parameter values (Student, Integer) for (de)marshalling parameters/entity body. diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java index ede0b3e055602..6b1337630ce6c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; /** * This interface is used on the client side only. diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java index 9bd73fe406d94..9b8c4491424c6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java @@ -7,12 +7,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; @Provider @Consumes("application/student") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java index 71648f112e9d0..e5352f5646510 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java @@ -6,12 +6,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -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.Produces; +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; @Provider @Produces("application/student") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java index b35f1bd895ada..520a5024cae12 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; @Path("absolutePath") public class GetAbsolutePathResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java index 70ff2175bda5e..317ad1962a1a1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java @@ -8,14 +8,14 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResource.java index 97a1f59331cb0..dafae78a13113 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; public interface InheritanceParentResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResourceImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResourceImpl.java index 539810789c2f4..889e4a01f33ef 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResourceImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritanceParentResourceImpl.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path(value = "/InheritanceTest") public class InheritanceParentResourceImpl implements InheritanceParentResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java index e1e8c2c209872..f5af470e89c97 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/") public class MatchedResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java index 456d56f81d82b..7ea9b78950af7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.util.Collection; -import javax.ws.rs.Produces; -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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; @Provider @Produces(MediaType.TEXT_PLAIN + "; charset=UTF-8") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java index 6c048a6791aa0..76c67e6f88632 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.util.Collection; -import javax.ws.rs.Produces; -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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; @Provider @Produces(MediaType.APPLICATION_XML + "; charset=UTF-8") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java index 66c4f15f76564..8fc5281d93763 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java @@ -3,15 +3,15 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; @Path("/") public class MediaTypeFromMessageBodyWriterResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java index 9782b667f5423..3935d00ca1ce1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public interface MultiInterfaceResLocatorIntf1 { @GET diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java index 8111192887a05..2104e8b5639b3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public interface MultiInterfaceResLocatorIntf2 { @GET diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java index 32c9e91131bba..70488cab16f57 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/") public class MultiInterfaceResLocatorResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java index 911cc3553f3ee..79389cd3f375c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -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; @Path("/api") @Produces(MediaType.APPLICATION_JSON) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java index 49c950756375e..b07af97f577d7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java @@ -2,13 +2,13 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java index d9862c779209d..a6ccaae4608b2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; public interface ParameterSubResGenericInterface { @GET diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java index 621810fead935..a0918089a263d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java @@ -5,7 +5,7 @@ import java.lang.reflect.Proxy; import java.util.List; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("generic") public class ParameterSubResGenericSub { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java index be75c62d2e6dd..4066e2c7c516a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.PUT; +import jakarta.ws.rs.PUT; public interface ParameterSubResInternalInterface { @PUT diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java index 7ca75b42c58e3..ba46d8d46afc8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; public interface ParameterSubResRoot { @Path("sub/{path}") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java index 8719ce20f2971..36708505544c3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/path") public class ParameterSubResRootImpl implements ParameterSubResRoot { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java index 79d615a7f1402..45d6d920d1128 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; public interface ParameterSubResSub { @GET diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java index 771dff2e2baf1..6f96140cd705c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestScopedObject { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java index 818276a62f84a..5c0089b6ecc02 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java @@ -3,13 +3,13 @@ import java.io.IOException; import java.lang.reflect.Method; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Provider; @Provider public class ResourceInfoInjectionFilter implements ContainerResponseFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java index 8b8d305ffd849..319833214901b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java @@ -5,10 +5,10 @@ import java.lang.reflect.Proxy; import java.util.List; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java index f4462d3253938..19884a6a3ec4b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/collection") public class ResourceLocatorCollectionResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java index 9a4844292bd04..5edfcb8c77674 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/directory") public class ResourceLocatorDirectory { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java index 16dbf319af970..56f901bcb0f66 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; public class ResourceLocatorReceiver { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java index dc019b7baf31a..393c4f6080805 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -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; @Produces(MediaType.TEXT_PLAIN) public interface ResourceLocatorRootInterface { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java index 9f2cb61f3f0ed..574bb3d920e65 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; @Produces(MediaType.TEXT_PLAIN) public interface ResourceLocatorSubInterface extends ResourceLocatorRootInterface { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java index 916ffc241f6f5..febacd2ff7ef2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestPath; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java index 069786972a9dc..637ca33eb0afc 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java index 871463c73e923..d0aeb0ae9cbf1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; public interface ResourceLocatorSubresource3Interface { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java index 0c518d330a1f0..e35a34898206e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java index f57d270263e35..b287aa49ea256 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/test") public interface ScanProxy { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java index c57ffae49ed8b..578779ac761e9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public class ScanSubresource { @Path("doit") diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java index 4262119cf37e6..596d7f49bd662 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -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.Context; -import javax.ws.rs.core.HttpHeaders; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java index ff7d79bee4816..7214bbb6a781a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java index b2f3eba6be5d4..4f1b96e69f01d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/inputstream") public class SpecialResourceStreamResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java index 00ff276718574..03ad67d685b57 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java @@ -2,15 +2,15 @@ import java.util.List; -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; public interface SubResourceLocatorBaseCrudService { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java index 824ce81f8e3b2..4046d87e9fd4a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -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; public interface SubResourceLocatorBaseService extends SubResourceLocatorBaseCrudService { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java index 116f1388974f8..589e570bd82a8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; public interface SubResourceLocatorFoo { @GET diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java index 20f6f13b82722..b69c285a18996 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("blah") public class SubResourceLocatorImpFoo implements SubResourceLocatorFoo { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java index 58e19750e944d..352928bc3b99e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; public class SubResourceLocatorPlatformServiceImpl implements SubResourceLocatorPlatformServiceResource { @Override diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java index 39d503eb55c0b..6edec186c5787 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/platform") public interface SubResourceLocatorPlatformServiceResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java index f8c63ce5a8936..904df9157b675 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java @@ -2,16 +2,16 @@ import java.util.List; -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.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.QueryParam; +import jakarta.ws.rs.core.MediaType; @Path("/users") public interface SubResourceLocatorUserResource extends SubResourceLocatorBaseService { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java index 86cb2b953627a..3dc1156257565 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java index b0eed0db506e2..b96644f68f70a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java index 509bd62d62b05..e6e8d919bd602 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java index fe86c2fa716fc..9c8680fe8efe6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java index 981c2a36063b7..50d784e3e30fa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java @@ -2,12 +2,12 @@ import java.net.URI; -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.UriInfo; +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.UriInfo; @Path("/") public class UriInfoRelativizeResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java index 7ba33b4faa167..4dc7cc4e1ab33 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java index 5c92562566c6f..8671e713e4b99 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java index 884a094974b9e..f6ca132bb404f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; @Path("{x:.*}") public class WiderMappingDefaultOptions { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java index 737e54b1678a5..a6e3463919912 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resource.basic.resource; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/hello") public class WiderMappingResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ChunkedResponseTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ChunkedResponseTest.java index ae68349b887c2..025583a9456fe 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ChunkedResponseTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ChunkedResponseTest.java @@ -11,14 +11,14 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java index de539d169c823..e5f742510937e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/NullHeaderTestCase.java @@ -4,13 +4,13 @@ import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -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.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java index a4c2a6877327b..0082df9202e63 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.response; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/RestResponseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/RestResponseResource.java index 41581c6eaef40..c133abfcefe56 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/RestResponseResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/RestResponseResource.java @@ -7,13 +7,13 @@ import java.util.Locale; import java.util.Optional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java index 8ab56151e64a0..ecce4a0cd7390 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -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.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class AsyncFilterExceptionMapper implements ExceptionMapper { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java index 467b7b48421d3..1aab642a63ae1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @PreMatching @Priority(1) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java index 3260a8f238804..fc4c9475d32c1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @PreMatching @Priority(2) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java index 20abdb936d140..d2197a54ec80c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @PreMatching @Priority(3) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java index b084a64a9f382..3b2fc578c9ffa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java @@ -4,7 +4,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java index e95b9bf707967..3828d672eace3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(1) @Provider diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java index 70379bfb39975..8cfe52c282fd4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(2) @Provider diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java index 584e67e65ba16..232239efbaf40 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(3) @Provider diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java index ef8d14c1b669f..7d1ed88ed1ca4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java @@ -5,12 +5,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java index 5bc56de01ab82..be4a258482881 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java @@ -4,11 +4,11 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java index 4cd637586bca5..72f6a98383cd6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java @@ -4,13 +4,13 @@ import java.io.StringWriter; import java.util.concurrent.TimeUnit; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -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.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java index fd6615825a578..7892aa7e022f5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java @@ -6,7 +6,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseContext; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java index dce1fa1d4d91b..97f0ed80c557a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(1) @Provider diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java index 6a32c14b64d81..7f92320d0f83b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(2) @Provider diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java index 7b93d87611795..576a6182519dc 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(3) @Provider diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationFailedExceptionHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationFailedExceptionHeaderTest.java index 4b4c3d67efe79..144382c69c303 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationFailedExceptionHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationFailedExceptionHeaderTest.java @@ -6,7 +6,7 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionHeaderTest.java index 35157e762ad77..30864020f322d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionHeaderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionHeaderTest.java @@ -7,7 +7,7 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionMapperTest.java index e5a6d2905b6d8..193e283828267 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/AuthenticationRedirectExceptionMapperTest.java @@ -4,8 +4,8 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/CustomExceptionMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/CustomExceptionMapperTest.java index bc65814e0c2e8..7c279f4a29396 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/CustomExceptionMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/CustomExceptionMapperTest.java @@ -2,10 +2,10 @@ import static io.restassured.RestAssured.when; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/HelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/HelloResource.java index 5f470ccf640f7..cedacce83d235 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/HelloResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/HelloResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.security; -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.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllBlockingResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllBlockingResource.java index 68208cecf59ae..4a6ade5aee8e1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllBlockingResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllBlockingResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.common.annotation.Blocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java index 9854125d2517e..7d72a18054ba5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.common.annotation.NonBlocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionHandlerTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionHandlerTest.java index 49adcf5d43756..d69053601e665 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionHandlerTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionHandlerTest.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.security; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import java.util.function.Supplier; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionMapperTest.java index 61f250e251ee3..c1fe4cc7fcfcd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthCompletionExceptionMapperTest.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.security; -import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; +import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; import java.util.function.Supplier; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; @@ -69,4 +69,4 @@ public Response unauthorized() { } -} \ No newline at end of file +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenExMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenExMapperTest.java index e16c8b2ee787f..277143e2577fb 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenExMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenExMapperTest.java @@ -1,13 +1,13 @@ package io.quarkus.resteasy.reactive.server.test.security; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static org.hamcrest.Matchers.equalTo; import java.util.function.Supplier; -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.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -76,4 +76,4 @@ public Response forbidden() { } -} \ No newline at end of file +} diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenHandlerTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenHandlerTest.java index 15ce1ca3a4b96..5fa95ba687eaa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenHandlerTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ProactiveAuthHttpPolicyForbiddenHandlerTest.java @@ -1,12 +1,12 @@ package io.quarkus.resteasy.reactive.server.test.security; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static org.hamcrest.Matchers.equalTo; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedBlockingResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedBlockingResource.java index d3fa6f2e7aa3d..17eb48b30ee5f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedBlockingResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedBlockingResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.security.identity.CurrentIdentityAssociation; import io.smallrye.common.annotation.Blocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java index 5621fb9fe9067..6df18df664b07 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java @@ -8,11 +8,11 @@ import java.lang.reflect.Type; import java.util.Arrays; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -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.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java index ede7b1a80968b..bcbc12f51b34f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.security.identity.CurrentIdentityAssociation; import io.smallrye.common.annotation.NonBlocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedService.java index 716baa62472d0..23c1203c114e8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedService.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedService.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class RolesAllowedService { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedServiceResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedServiceResource.java index b67faaa6b9317..6ded9428be1b0 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedServiceResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedServiceResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.security; -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; @Path("/roles-service") public class RolesAllowedServiceResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java index 5e9f8d1f53902..4850fa18ac982 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.security.Principal; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.ext.Provider; @Provider @PreMatching diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java index 16db7d24dde92..94a5446b55170 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityWithMethodGenericsTest.java @@ -7,15 +7,15 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -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.MultivaluedMap; -import javax.ws.rs.ext.Provider; +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.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.providers.serialisers.ServerDefaultTextPlainBodyHandler; import org.junit.jupiter.api.BeforeAll; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SerializationRolesResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SerializationRolesResource.java index e2b273183fa33..97b9fe7175218 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SerializationRolesResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SerializationRolesResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import io.smallrye.common.annotation.Blocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java index 72ea700a0edff..9129d5c4c9726 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.common.annotation.NonBlocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java index 212678ae7b6d1..346248abc0ac9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.security; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java index c751cd7b7c7a1..10ac3f90765df 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.security; -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; import io.smallrye.common.annotation.Blocking; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java index 8ccc6343c3432..d104482278ff3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java index 3d7b3be0844ba..e4958029a1c97 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java @@ -9,15 +9,15 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.*; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.*; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java index 880ad64150276..e280e86eae0ae 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java index 1fca320a2bfb0..db72b4de9985c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.TYPE, ElementType.METHOD }) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java index 26979401343a0..0d2c810accfce 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java index 5e5920d7187e8..83372e380cddf 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java index 8ec903acc438b..6550634388557 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java @@ -6,11 +6,11 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java index fc85caf6675f0..723c5df4a9c9b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java @@ -6,18 +6,18 @@ import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.DisplayName; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ContextParamFromCdiTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ContextParamFromCdiTest.java index ce96213d7144f..cd79a98328abd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ContextParamFromCdiTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ContextParamFromCdiTest.java @@ -1,11 +1,11 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.enterprise.context.ApplicationScoped; -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 jakarta.enterprise.context.ApplicationScoped; +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 org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java index 376612d254a1c..a82d849425472 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; @Priority(Priorities.USER + 1000) public class DynamicFeatureRequestFilterWithLowPriority implements ContainerRequestFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java index f95bea81a89e7..f332f46b938b1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; public class FeatureMappedExceptionMapper implements Cloneable, ExceptionMapper, Serializable { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java index d8747131ffcea..83332a0e94d04 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; @Priority(Priorities.AUTHENTICATION) public class FeatureRequestFilterWithHighestPriority implements ContainerRequestFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java index f3e30db9219cd..b5f99b860b7dc 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; public class FeatureRequestFilterWithNormalPriority implements ContainerRequestFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java index 6c7e4cab8cb1a..5aaafa4941134 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; public class FeatureResponseFilter implements ContainerResponseFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java index a3776b3e9c462..13c2cb34a46dd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java @@ -1,12 +1,12 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java index bdbc47772cc09..50da704dc3603 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java @@ -1,13 +1,13 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java index 8c58b741625c3..797e427499317 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.TYPE, ElementType.METHOD }) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java index 921a8cbfea0cf..ba2549fb490ed 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; @Path("/ctor-header") public class HeaderParamResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java index 2656f4c068fd4..7c900e8713e9f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import io.vertx.ext.web.RoutingContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java index 9948f486809a3..8e9cd5802221b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java @@ -6,9 +6,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java index c1871daa1da30..58f9b34c2bc75 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.simple; -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("iface") public interface InterfaceResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java index e7943d12c2f94..ec761fd162d81 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.inject.Inject; +import jakarta.inject.Inject; public class InterfaceResourceImpl implements InterfaceResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java index c45fc5348e202..57508ca9d71c1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceWithImplTest.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.simple; -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.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Issue22408TestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Issue22408TestCase.java index 45544cd36c152..26a7fb22cd564 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Issue22408TestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Issue22408TestCase.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java index 2124f1f3cc5f0..0b75ea11fa838 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java @@ -5,13 +5,13 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java index 40aa121072a95..da8fda7059e8a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java @@ -2,10 +2,10 @@ import java.time.LocalDate; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MapWithParamConverterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MapWithParamConverterTest.java index 2f3a9ec1d4370..419dfdd721533 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MapWithParamConverterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MapWithParamConverterTest.java @@ -6,12 +6,12 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -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.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java index 62f5bad385c7e..b00d83888ab90 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; public class MyParameterConverter implements ParamConverter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java index 7937e776b45d4..114c9c4cc97ab 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; @Provider public class MyParameterProvider implements ParamConverterProvider { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java index 1179ce0fb1321..c409c17458efd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java @@ -2,20 +2,20 @@ import java.util.Optional; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Providers; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Providers; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.reactive.RestCookie; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OptionalQueryParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OptionalQueryParamResource.java index a27c34bd9fb0a..90beb87d2e802 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OptionalQueryParamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OptionalQueryParamResource.java @@ -7,9 +7,9 @@ import java.util.SortedSet; import java.util.stream.Collectors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/optional-query/greetings") public class OptionalQueryParamResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java index a10d946fa4224..e3685677b0516 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java index e28b55e4c0597..774707bf97040 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class Person { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java index 805a0f2f112e0..2457d036ec257 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; @Path("/ctor-query") public class QueryParamResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java index 957f14806e1d7..25f81c6744caf 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RequestScopeExceptionMapperTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RequestScopeExceptionMapperTest.java index 2230316e74299..5ca8a2f472a88 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RequestScopeExceptionMapperTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RequestScopeExceptionMapperTest.java @@ -2,15 +2,15 @@ import java.util.function.Supplier; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotAllowedException; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotAllowedException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java index 2b3a815660727..7b00270808fa3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; @Provider public class ResourceInfoInjectingFilter implements ContainerRequestFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java index 3e8a40917028d..f08c28f0e9937 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/") public class RootAResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java index 0184794913c48..78ebe5996e3c3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/") public class RootBResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SeparatorQueryParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SeparatorQueryParamTest.java index c520568020663..c6ad9820b5ff8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SeparatorQueryParamTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SeparatorQueryParamTest.java @@ -4,9 +4,9 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java index bf3a4763e2d18..b0efa1a108c1e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java index 895a728bbd143..ec39fe9b19749 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java @@ -6,32 +6,32 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.PATCH; -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.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Providers; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.PATCH; +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.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Providers; import org.jboss.resteasy.reactive.RestHeader; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java index e1546a77d6fc8..79a38e23e154a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PATCH; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; public class SubResource { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java index 51512f8de968f..8f7d2d83fac7f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; @HttpMethod("TRACE") @Target(value = ElementType.METHOD) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java index d022a9a183caf..0a063dc18ce2e 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Bar diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java index 098d5ae13742a..9af2a8e0d7fd5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Bar diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java index 6c2d0af92ba4a..1d64fe5e316cd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; @Provider public class TestDynamicFeature implements DynamicFeature { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java index dea268a763a09..577e359eec92d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class TestExceptionMapper implements ExceptionMapper { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java index 46724cc504241..063df758b71ba 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java @@ -1,9 +1,9 @@ package io.quarkus.resteasy.reactive.server.test.simple; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; @Provider public class TestFeature implements Feature { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java index 2fe83a04bf17f..d7b1efb1cb24f 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Foo diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java index dc46967780589..b0db0e64178a5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Foo diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java index d59cb2059b7ae..19b3095587c3d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import io.vertx.core.http.HttpServerRequest; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java index 519ee0f7f57a7..becf2c82bfd9d 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Foo diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java index 4b8ff257647c9..ca8b0e292585c 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @Provider @PreMatching diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java index e56f5c19edc11..2430ce0617460 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider public class TestRequestFilter implements ContainerRequestFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java index c7fe67b4e3436..33133c1d5a67a 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Priority(Priorities.AUTHORIZATION) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java index 32cc859af874f..7b59b0e6d5d05 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Priority(Priorities.AUTHENTICATION) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java index 1d4504d7a6a8c..3c40fe267c8d1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider public class TestResponseFilter implements ContainerResponseFilter { diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java index 149a01aa04cd1..4bb72a7f66cdc 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java index bad67513e8451..590c0d0820629 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java @@ -6,12 +6,12 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.Produces; -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.Produces; +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; @Provider @Produces(MediaType.TEXT_PLAIN) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java index ef843a52c456a..a8496f9d1d8b9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/status/ResponseStatusTest.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 org.jboss.resteasy.reactive.ResponseStatus; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java index 31f931789d3de..a6f8ea1df87a7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java @@ -1,17 +1,18 @@ package io.quarkus.resteasy.reactive.server.test.stream; import java.util.Date; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -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.sse.OutboundSseEvent; -import javax.ws.rs.sse.Sse; +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.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.Sse; import org.jboss.resteasy.reactive.common.util.MultiCollectors; import org.reactivestreams.Publisher; @@ -20,6 +21,7 @@ import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.infrastructure.Infrastructure; import io.vertx.core.buffer.Buffer; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; @Path("stream") public class StreamResource { @@ -43,10 +45,17 @@ public Multi getStreamedText() { @Path("text/stream/publisher") @GET @Produces(MediaType.TEXT_PLAIN) - public Publisher getStreamedTextPublisher() { + public Flow.Publisher getStreamedTextPublisher() { return Multi.createFrom().items("foo", "bar"); } + @Path("text/stream/legacy-publisher") + @GET + @Produces(MediaType.TEXT_PLAIN) + public Publisher getStreamedTextLegacyPublisher() { + return AdaptersToReactiveStreams.publisher(Multi.createFrom().items("foo", "bar")); + } + @Path("byte-arrays/collect") @GET @Produces(MediaType.TEXT_PLAIN) @@ -78,7 +87,7 @@ public Multi getStreamedCharArrays() { @Path("char-arrays/stream/publisher") @GET @Produces(MediaType.TEXT_PLAIN) - public Publisher getStreamedCharArraysPublisher() { + public Flow.Publisher getStreamedCharArraysPublisher() { return Multi.createFrom().items("foo".toCharArray(), "bar".toCharArray()); } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java index f1615e674ad80..7a2135bd216cd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java @@ -9,10 +9,10 @@ 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.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.hamcrest.Matchers; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; @@ -105,6 +105,10 @@ public void testStreaming() throws Exception { .then() .statusCode(200) .body(Matchers.equalTo("foobar")); + RestAssured.get("/stream/text/stream/legacy-publisher") + .then() + .statusCode(200) + .body(Matchers.equalTo("foobar")); RestAssured.get("/stream/text/collect") .then() .statusCode(200) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java index 5b3e3e6c0a94b..3244221fbb126 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stress/SuspendResumeStressTest.java @@ -8,8 +8,8 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.jandex.ClassInfo; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java index 938cd2da93dea..6fb2650109dc2 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/transformation/AnnotationTransformationTest.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.function.Consumer; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.Path; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.jandex.AnnotationInstance; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java index 32bc4efa94674..f3e80034ccc5b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.test.websocket; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.Handler; import io.vertx.core.http.ServerWebSocket; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java index 80a154f2bbce1..6c9b447a175f1 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java @@ -23,13 +23,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Variant; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.ServerMediaType; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java index 1f9b04bbbba7a..f23cd1e048b4b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java @@ -1,10 +1,10 @@ package io.quarkus.resteasy.reactive.server.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.ws.rs.ext.Providers; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.ws.rs.ext.Providers; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java index 786c97e6f4b56..3b9dc718b2ef6 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.runtime; -import javax.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.ContextNotActiveException; import org.jboss.resteasy.reactive.server.core.CurrentRequest; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java index 0d772ca1a5c39..279698e570ca4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.runtime; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.SecurityContext; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveCompressionHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveCompressionHandler.java index 237cd8c8694fc..c6be2343ccdb3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveCompressionHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveCompressionHandler.java @@ -2,8 +2,8 @@ import java.util.Set; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.core.EncodedMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java index 12ff82477be4c..e6ec3e33e8405 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java @@ -14,7 +14,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java index 63b6e385fed34..05a5a12f556c4 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java @@ -2,7 +2,7 @@ import java.security.Principal; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.SecurityContext; import io.quarkus.security.identity.CurrentIdentityAssociation; import io.quarkus.security.identity.SecurityIdentity; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java index 995b090653838..0aa4fdea04576 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.function.Function; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/StandardSecurityCheckInterceptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/StandardSecurityCheckInterceptor.java index 6b94b33b4a126..cd42e556e3166 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/StandardSecurityCheckInterceptor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/StandardSecurityCheckInterceptor.java @@ -5,14 +5,14 @@ import java.lang.reflect.Method; -import javax.annotation.Priority; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; @@ -59,7 +59,7 @@ public static final class RolesAllowedInterceptor extends StandardSecurityCheckI } /** - * Prevent the SecurityHandler from performing {@link javax.annotation.security.PermitAll} security checks + * Prevent the SecurityHandler from performing {@link jakarta.annotation.security.PermitAll} security checks */ @Interceptor @PermitAll diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java index d3f1dd499923f..acf80b9c11b8b 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import io.quarkus.security.AuthenticationCompletionException; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java index cbf6d994e8424..bb2148a87c7a7 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java index 2dc9d1e0fc486..577afae40a549 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import io.quarkus.security.AuthenticationRedirectException; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java index bfad75655a6c9..dfb42218a2aeb 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import io.quarkus.security.ForbiddenException; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java index 375e2a3e26c60..4872aeb141470 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java @@ -4,7 +4,7 @@ import java.util.function.Function; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import io.quarkus.vertx.http.runtime.security.ChallengeData; import io.quarkus.vertx.http.runtime.security.HttpAuthenticator; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java index 84246647466d4..12678be09af16 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java index 9f346c1d56ea3..64e04f1eb5c92 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.function.Function; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.SecurityContext; import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java index 2c3ebfbdd88ff..b639fa9718da8 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.runtime.websocket; -import javax.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.CompletionCallback; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java index fa3f116917225..0ddb58a0af628 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.util.TypeLiteral; import org.jboss.resteasy.reactive.common.util.types.TypeSignatureParser; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/ContextTypeBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/ContextTypeBuildItem.java index cfea09343a228..401f10f51e337 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/ContextTypeBuildItem.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/ContextTypeBuildItem.java @@ -1,6 +1,6 @@ package io.quarkus.resteasy.reactive.server.spi; -import javax.ws.rs.core.Context; +import jakarta.ws.rs.core.Context; import org.jboss.jandex.DotName; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/UnwrappedExceptionBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/UnwrappedExceptionBuildItem.java index 5cdee8cf359a4..6cb915916c3fa 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/UnwrappedExceptionBuildItem.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/server/spi/UnwrappedExceptionBuildItem.java @@ -3,7 +3,7 @@ import io.quarkus.builder.item.MultiBuildItem; /** - * When an Exception of this type is thrown and no {@code javax.ws.rs.ext.ExceptionMapper} exists, + * When an Exception of this type is thrown and no {@code jakarta.ws.rs.ext.ExceptionMapper} exists, * then RESTEasy Reactive will attempt to locate an {@code ExceptionMapper} for the cause of the Exception. */ public final class UnwrappedExceptionBuildItem extends MultiBuildItem { diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/main/java/io/quarkus/rest/client/reactive/jackson/deployment/RestClientReactiveJacksonProcessor.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/main/java/io/quarkus/rest/client/reactive/jackson/deployment/RestClientReactiveJacksonProcessor.java index 7b7d967cab8aa..12fe28143cc6e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/main/java/io/quarkus/rest/client/reactive/jackson/deployment/RestClientReactiveJacksonProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/main/java/io/quarkus/rest/client/reactive/jackson/deployment/RestClientReactiveJacksonProcessor.java @@ -7,8 +7,8 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java index df985eb8e0bbc..9e03af7e052cb 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/BadRequestNotPropagatedTestCase.java @@ -3,16 +3,16 @@ import java.net.URL; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -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.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java index 53e2147f4146f..cecc8a6be8f97 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/deployment/src/test/java/io/quarkus/rest/client/reactive/jackson/test/MultiSseTest.java @@ -9,11 +9,11 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; -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.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.RestClientBuilder; import org.jboss.resteasy.reactive.server.jackson.JacksonBasicMessageBodyReader; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyReader.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyReader.java index 662a9a77ee378..19d3d79d72b64 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyReader.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyReader.java @@ -8,11 +8,11 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.ClientWebApplicationException; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java index 3c8158c1c725a..1ba281fc8c3e8 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jackson/runtime/src/main/java/io/quarkus/rest/client/reactive/jackson/runtime/serialisers/ClientJacksonMessageBodyWriter.java @@ -11,11 +11,11 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/main/java/io/quarkus/rest/client/reactive/jaxb/deployment/RestClientReactiveJaxbProcessor.java b/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/main/java/io/quarkus/rest/client/reactive/jaxb/deployment/RestClientReactiveJaxbProcessor.java index 90a3fcd1585f7..782e07ac96978 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/main/java/io/quarkus/rest/client/reactive/jaxb/deployment/RestClientReactiveJaxbProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/main/java/io/quarkus/rest/client/reactive/jaxb/deployment/RestClientReactiveJaxbProcessor.java @@ -4,9 +4,9 @@ import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/test/java/io/quarkus/rest/client/reactive/jaxb/test/SimpleJaxbTest.java b/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/test/java/io/quarkus/rest/client/reactive/jaxb/test/SimpleJaxbTest.java index ac28832e3a560..601bbb8558083 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/test/java/io/quarkus/rest/client/reactive/jaxb/test/SimpleJaxbTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jaxb/deployment/src/test/java/io/quarkus/rest/client/reactive/jaxb/test/SimpleJaxbTest.java @@ -5,11 +5,11 @@ import java.net.URI; import java.util.Objects; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientJaxbMessageBodyReader.java b/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientJaxbMessageBodyReader.java index 171b6984863c5..8fc460434be08 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientJaxbMessageBodyReader.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientJaxbMessageBodyReader.java @@ -5,17 +5,18 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; + import org.jboss.resteasy.reactive.common.util.StreamUtil; @ActivateRequestContext diff --git a/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientMessageBodyWriter.java b/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientMessageBodyWriter.java index ec52eb6f36a7c..9d1b1f9043869 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientMessageBodyWriter.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jaxb/runtime/src/main/java/io/quarkus/rest/client/reactive/jaxb/runtime/ClientMessageBodyWriter.java @@ -5,19 +5,20 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.namespace.QName; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.annotation.XmlRootElement; + @ActivateRequestContext public class ClientMessageBodyWriter implements MessageBodyWriter { diff --git a/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java b/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java index 793d05e9bd93c..fd3b5ead0e5b7 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/main/java/io/quarkus/rest/client/reactive/jsonb/deployment/RestClientReactiveJsonbProcessor.java @@ -2,7 +2,7 @@ import static io.quarkus.deployment.Feature.REST_CLIENT_REACTIVE_JSONB; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; diff --git a/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/test/java/io/quarkus/rest/client/reactive/jsonb/test/SimpleJsonbTest.java b/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/test/java/io/quarkus/rest/client/reactive/jsonb/test/SimpleJsonbTest.java index 3f77b707afc74..84d1631e1b50d 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/test/java/io/quarkus/rest/client/reactive/jsonb/test/SimpleJsonbTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive-jsonb/deployment/src/test/java/io/quarkus/rest/client/reactive/jsonb/test/SimpleJsonbTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Objects; -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.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/rest/client/reactive/kotlin/deployment/RestClientReactiveKotlinSerializationProcessor.java b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/rest/client/reactive/kotlin/deployment/RestClientReactiveKotlinSerializationProcessor.java index c85df4428a142..cb212499d792b 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/rest/client/reactive/kotlin/deployment/RestClientReactiveKotlinSerializationProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/deployment/src/main/java/io/quarkus/rest/client/reactive/kotlin/deployment/RestClientReactiveKotlinSerializationProcessor.java @@ -4,9 +4,9 @@ import java.util.Collections; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyReader.kt b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyReader.kt index e30c20afa85b5..dc98b398d4088 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyReader.kt +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyReader.kt @@ -1,5 +1,8 @@ package io.quarkus.rest.client.reactive.kotlin.runtime.serializers +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.MultivaluedMap +import jakarta.ws.rs.ext.MessageBodyReader import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream @@ -7,9 +10,6 @@ import kotlinx.serialization.serializer import org.jboss.resteasy.reactive.common.util.StreamUtil import java.io.InputStream import java.lang.reflect.Type -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.MultivaluedMap -import javax.ws.rs.ext.MessageBodyReader @OptIn(ExperimentalSerializationApi::class) class ClientKotlinMessageBodyReader(private val json: Json) : MessageBodyReader { diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyWriter.kt b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyWriter.kt index 8d2a4c9398b42..64192201b3788 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyWriter.kt +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/runtime/src/main/kotlin/io/quarkus/rest/client/reactive/kotlin/runtime/serializers/ClientKotlinMessageBodyWriter.kt @@ -1,14 +1,14 @@ package io.quarkus.rest.client.reactive.kotlin.runtime.serializers +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.MultivaluedMap +import jakarta.ws.rs.ext.MessageBodyWriter import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.encodeToStream import kotlinx.serialization.serializer import java.io.OutputStream import java.lang.reflect.Type -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.MultivaluedMap -import javax.ws.rs.ext.MessageBodyWriter @OptIn(ExperimentalSerializationApi::class) class ClientKotlinMessageBodyWriter(private val json: Json) : MessageBodyWriter { diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt index e1bb4a76674e1..bdb50b859821d 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/EncodeDefaultValuesTest.kt @@ -7,7 +7,7 @@ import kotlinx.serialization.json.Json import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.inject.Inject +import jakarta.inject.Inject class EncodeDefaultValuesTest { companion object { diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt index fc5d2facf4466..0c816f080622f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/ExplicitNullsTest.kt @@ -7,7 +7,7 @@ import kotlinx.serialization.json.Json import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.inject.Inject +import jakarta.inject.Inject class ExplicitNullsTest { companion object { diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt index 668c1245b35f3..91213df829fd1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/LenientTest.kt @@ -8,7 +8,7 @@ import kotlinx.serialization.json.Json import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.inject.Inject +import jakarta.inject.Inject class LenientTest { companion object { diff --git a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt index ba2ee556436f7..45234612beb90 100644 --- a/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt +++ b/extensions/resteasy-reactive/rest-client-reactive-kotlin-serialization/tests/src/test/kotlin/io/quarkus/rest/client/reactive/kotlin/test/PrettyPrintTest.kt @@ -10,7 +10,7 @@ import kotlinx.serialization.json.JsonNames import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import javax.inject.Inject +import jakarta.inject.Inject @OptIn(ExperimentalSerializationApi::class) class PrettyPrintTest { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientExceptionMapperHandler.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientExceptionMapperHandler.java index 53590911221eb..92ff7b83b10fe 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientExceptionMapperHandler.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ClientExceptionMapperHandler.java @@ -4,8 +4,8 @@ import java.lang.reflect.Modifier; import java.util.LinkedHashMap; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; import org.jboss.jandex.AnnotationInstance; @@ -82,7 +82,7 @@ Result generateResponseExceptionMapper(AnnotationInstance instance) { } if (!isValid) { String message = DotNames.CLIENT_EXCEPTION_MAPPER - + " is only supported on static methods of REST Client interfaces that take 'javax.ws.rs.core.Response' as a single parameter and return 'java.lang.RuntimeException'."; + + " is only supported on static methods of REST Client interfaces that take 'jakarta.ws.rs.core.Response' as a single parameter and return 'java.lang.RuntimeException'."; if (targetMethod != null) { message += " Offending instance is '" + targetMethod.declaringClass().name().toString() + "#" + targetMethod.name() + "'"; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java index 4dcaa0be357f6..0a751573fc567 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseFilter; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParams; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java index 230a9cb0e913c..e1adaecfa011a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.Configurable; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.Configurable; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.RestClientDefinitionException; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java index 236911b507336..c34febe9f0420 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java @@ -24,12 +24,12 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Typed; -import javax.inject.Singleton; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Typed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ArrayPairsQueryParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ArrayPairsQueryParamTest.java index 19c285979b981..7771e5c0a3932 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ArrayPairsQueryParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ArrayPairsQueryParamTest.java @@ -11,10 +11,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java index f1e471cabde99..00c2cef0f0194 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/AsyncHeaderTest.java @@ -9,11 +9,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.HeaderParam; +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.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java index d6ad8b08a1900..5b1cf5b65e7f4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicRestClientTest.java @@ -5,10 +5,10 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java index d099c885ba2cd..d1d24b4c1b9da 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClassNameScopeOverrideTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java index 397b811dc060e..c154d7e6e2dd7 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ClientAndServerSharingResponseTest.java @@ -9,14 +9,14 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -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.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java index 3bb4f304f773e..71b78eda7b316 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigKeyScopeOverrideTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java index 5b7f7c2dc7fdd..21b749444d7f6 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConfigurationTest.java @@ -5,9 +5,9 @@ import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConnectionPoolSizeTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConnectionPoolSizeTest.java index bf318df4cb1f6..d2042f8782ada 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConnectionPoolSizeTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ConnectionPoolSizeTest.java @@ -8,9 +8,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -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 org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaInjectedRestClientTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaInjectedRestClientTest.java index db5912882e267..2fe3ab28bccf1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaInjectedRestClientTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaInjectedRestClientTest.java @@ -5,11 +5,11 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaProgrammaticallyClientCreatedTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaProgrammaticallyClientCreatedTest.java index 9d0cc33366734..e95793ef8915e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaProgrammaticallyClientCreatedTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/CustomHttpOptionsViaProgrammaticallyClientCreatedTest.java @@ -5,10 +5,10 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.ext.ContextResolver; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.ext.ContextResolver; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.RestResponse; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/EmptyPostTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/EmptyPostTest.java index 78fb47de59435..72d3b069f470c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/EmptyPostTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/EmptyPostTest.java @@ -4,9 +4,9 @@ import java.net.URI; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/FormTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/FormTest.java index 02a9c8698255c..4c7426ff74168 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/FormTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/FormTest.java @@ -4,13 +4,13 @@ import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java index 2aeee8d415d40..463c52f8949ec 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/GlobalConfigurationTest.java @@ -5,10 +5,10 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.ext.QueryParamStyle; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java index 8038231aeb5d2..87dc6841bc41a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java @@ -1,10 +1,10 @@ package io.quarkus.rest.client.reactive; -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; @Path("/hello") public interface HelloClient { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java index 660c55a0260d9..41d59bd54f9c4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java @@ -1,10 +1,10 @@ package io.quarkus.rest.client.reactive; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClientWithBaseUri.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClientWithBaseUri.java index 1a947b9261921..aa317d2dd030e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClientWithBaseUri.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClientWithBaseUri.java @@ -2,14 +2,15 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -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.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloNonSimpleClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloNonSimpleClient.java index 09b99baee4b79..e9beedbfcfc67 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloNonSimpleClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloNonSimpleClient.java @@ -2,13 +2,13 @@ import java.util.Map; -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.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.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java index f298c0b303011..28d592df3905b 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java @@ -4,15 +4,15 @@ import java.util.HashMap; import java.util.Map; -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.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Assertions; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidHostTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidHostTest.java index 88b25b6b104e6..bb5550b2c5e8e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidHostTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidHostTest.java @@ -2,10 +2,10 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.assertj.core.api.Assertions; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidURITest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidURITest.java index 94ff77ef943a7..5abe15c964d57 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidURITest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/InvalidURITest.java @@ -4,8 +4,8 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.assertj.core.api.Assertions; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java index f7854fa0c446a..d6d686b9633c6 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/LegacyConfigurationTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MapParamsTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MapParamsTest.java index 7775a901149a7..58ce21d52f25c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MapParamsTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MapParamsTest.java @@ -7,12 +7,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.RestQuery; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MediaTypeSuffixTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MediaTypeSuffixTest.java index b6be853724c35..b764ada80c5df 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MediaTypeSuffixTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MediaTypeSuffixTest.java @@ -5,9 +5,9 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java index 550d8f8b725da..7aff1508a70c4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpClassNameScopeOverrideTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java index 8747b61018efa..76f2cc86bd54a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpConfigKeyScopeOverrideTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java index 01c1d213e3f9b..c4b8e0e2771c0 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpGlobalScopeOverrideTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultiNdjsonTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultiNdjsonTest.java index beb02bc6c1707..55e116ad49c4f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultiNdjsonTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultiNdjsonTest.java @@ -11,11 +11,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -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.RestClientBuilder; import org.jboss.resteasy.reactive.RestStreamElementType; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/PlaylistService.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/PlaylistService.java index 6ecc3182f33c9..4e775b73c1348 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/PlaylistService.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/PlaylistService.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive; -import javax.ws.rs.GET; +import jakarta.ws.rs.GET; public interface PlaylistService { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RequestLeakDetectionTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RequestLeakDetectionTest.java index d1d2b403783a5..046c9040db8c1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RequestLeakDetectionTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RequestLeakDetectionTest.java @@ -10,12 +10,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RestClientListenerTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RestClientListenerTest.java index a649dcfbf68a1..94f9d2f2e2751 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RestClientListenerTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/RestClientListenerTest.java @@ -7,11 +7,11 @@ import java.time.Duration; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.HeaderParam; +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.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java index 5125d0e1a431f..0e0966d75a6d6 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ShortNameScopeOverrideTest.java @@ -4,9 +4,9 @@ import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/StreamJsonTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/StreamJsonTest.java index a8b12e9a5f47c..07344da0fae7f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/StreamJsonTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/StreamJsonTest.java @@ -11,11 +11,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -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.RestClientBuilder; import org.jboss.resteasy.reactive.RestStreamElementType; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java index 76d37c2e5d64e..10199646c6821 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java @@ -3,7 +3,7 @@ import java.net.URL; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyReader.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyReader.java index e00d824ebc95d..8780ddde175c9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyReader.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyReader.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.jboss.resteasy.reactive.server.jackson.JacksonBasicMessageBodyReader; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyWriter.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyWriter.java index d4d4c494bdfda..1e930784fef1e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyWriter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestJacksonBasicMessageBodyWriter.java @@ -7,11 +7,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestRestClientListener.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestRestClientListener.java index e5f7e389bf41b..4293243bf0330 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestRestClientListener.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestRestClientListener.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.spi.RestClientListener; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/VoidReturnTypeTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/VoidReturnTypeTest.java index b9caa732e38e7..3e3bd8cd3a197 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/VoidReturnTypeTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/VoidReturnTypeTest.java @@ -5,9 +5,9 @@ import java.net.URI; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/Client.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/Client.java index a98eaaa3040d2..8b4736caf9878 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/Client.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/Client.java @@ -1,9 +1,9 @@ package io.quarkus.rest.client.reactive.beanTypes; -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/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ClientMock.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ClientMock.java index b6bb9b45b4a0a..795696f40bca9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ClientMock.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ClientMock.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.beanTypes; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/MyBean.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/MyBean.java index 63b479b3061d9..56c72349715d1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/MyBean.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/MyBean.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.beanTypes; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ResourceBeanTypeTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ResourceBeanTypeTest.java index fd4b9f80157af..c2badb23a2194 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ResourceBeanTypeTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanTypes/ResourceBeanTypeTest.java @@ -4,10 +4,10 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanFormParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanFormParamTest.java index b3e339d497d5e..dfd1cab010fa3 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanFormParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanFormParamTest.java @@ -6,13 +6,13 @@ import java.lang.reflect.Type; import java.net.URI; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; @@ -90,10 +90,10 @@ enum Param { public static class ParamConverter implements ParamConverterProvider { @SuppressWarnings("unchecked") @Override - public javax.ws.rs.ext.ParamConverter getConverter(Class rawType, Type genericType, + public jakarta.ws.rs.ext.ParamConverter getConverter(Class rawType, Type genericType, Annotation[] annotations) { if (rawType == BeanFormParamTest.Param.class) { - return (javax.ws.rs.ext.ParamConverter) new javax.ws.rs.ext.ParamConverter() { + return (jakarta.ws.rs.ext.ParamConverter) new jakarta.ws.rs.ext.ParamConverter() { @Override public BeanFormParamTest.Param fromString(String value) { return null; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanParamTest.java index 47abd07a4f4c9..02facb4a25e22 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanParamTest.java @@ -4,13 +4,13 @@ import java.net.URI; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.RestCookie; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanPathParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanPathParamTest.java index 54503b61b1973..418437f39569f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanPathParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/beanparam/BeanPathParamTest.java @@ -4,10 +4,10 @@ import java.net.URI; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/configuration/EchoResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/configuration/EchoResource.java index b023965ff7cab..5cf4bf863e95f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/configuration/EchoResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/configuration/EchoResource.java @@ -1,13 +1,13 @@ package io.quarkus.rest.client.reactive.configuration; -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.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; @Path("/hello") @Produces(MediaType.TEXT_PLAIN) diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/converter/ParamConverterProviderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/converter/ParamConverterProviderTest.java index c7a211cdfd699..535ea3ebe2065 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/converter/ParamConverterProviderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/converter/ParamConverterProviderTest.java @@ -7,14 +7,14 @@ import java.lang.reflect.Type; import java.net.URI; -import javax.ws.rs.BeanParam; -import javax.ws.rs.CookieParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; @@ -161,7 +161,7 @@ enum Param { public static class ParamConverter implements ParamConverterProvider { @SuppressWarnings("unchecked") @Override - public javax.ws.rs.ext.ParamConverter getConverter(Class rawType, Type genericType, + public jakarta.ws.rs.ext.ParamConverter getConverter(Class rawType, Type genericType, Annotation[] annotations) { if (genericType == null) { fail("Generic Type cannot be null!"); @@ -172,7 +172,7 @@ public javax.ws.rs.ext.ParamConverter getConverter(Class rawType, Type } if (rawType == Param.class) { - return (javax.ws.rs.ext.ParamConverter) new javax.ws.rs.ext.ParamConverter() { + return (jakarta.ws.rs.ext.ParamConverter) new jakarta.ws.rs.ext.ParamConverter() { @Override public Param fromString(String value) { return null; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java index 762eabdbbc0e5..2161a6417d324 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ErrorMappingTest.java @@ -4,10 +4,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java index a572c8ab46bc4..a676a44fd8b60 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/ResponseExceptionMapperTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -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.core.Response; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/HighPriorityExceptionMapper.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/HighPriorityExceptionMapper.java index 0884914bab2f0..2713790a07240 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/HighPriorityExceptionMapper.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/HighPriorityExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.error.clientexceptionmapper; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/LowPriorityExceptionMapper.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/LowPriorityExceptionMapper.java index b7c7eab19fc48..6e5e310be2ec3 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/LowPriorityExceptionMapper.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/LowPriorityExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.error.clientexceptionmapper; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/ProgrammaticClientExceptionMapperTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/ProgrammaticClientExceptionMapperTest.java index 8d84859ddb876..3a5c05a8d05e4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/ProgrammaticClientExceptionMapperTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/ProgrammaticClientExceptionMapperTest.java @@ -5,9 +5,9 @@ import java.net.URI; -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.RestClientBuilder; import org.junit.jupiter.api.BeforeEach; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/RegisteredClientExceptionMapperTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/RegisteredClientExceptionMapperTest.java index 92ead62d1a898..815e8c1b21c2c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/RegisteredClientExceptionMapperTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/RegisteredClientExceptionMapperTest.java @@ -6,10 +6,10 @@ import java.lang.reflect.Method; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/Resource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/Resource.java index bae19e3df6237..a0148c5079110 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/Resource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/error/clientexceptionmapper/Resource.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.error.clientexceptionmapper; -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("/error") public class Resource { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java index fa8382cc0837e..b3b34acef50c9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormParamTest.java @@ -4,13 +4,13 @@ import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +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 org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormWithConverterTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormWithConverterTest.java index 5d42d9f168756..9df4834a01a1f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormWithConverterTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/FormWithConverterTest.java @@ -6,14 +6,14 @@ import java.lang.reflect.Type; import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +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.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/Resource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/Resource.java index 43c6e134210de..60e7ab32af3a2 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/Resource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/form/Resource.java @@ -1,12 +1,12 @@ package io.quarkus.rest.client.reactive.form; -import javax.ws.rs.Consumes; -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 jakarta.ws.rs.Consumes; +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 org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java index aae84d4a33e12..dc20fede15ae0 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/AsyncRestClientFallbackTest.java @@ -7,10 +7,10 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.ExecutionContext; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java index 96c8f0d7642a7..cdb91d548dcf8 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/RestClientFallbackTest.java @@ -3,10 +3,10 @@ import static io.quarkus.rest.client.reactive.RestClientTestUtil.setUrlForClass; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.faulttolerance.ExecutionContext; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java index 7100449f72ca3..ec4b932e17c90 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ft/UniRestClientFallbackTest.java @@ -3,10 +3,10 @@ import static io.quarkus.rest.client.reactive.RestClientTestUtil.setUrlForClass; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.faulttolerance.ExecutionContext; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java index ea4e632a402f2..dfb98aa1782c1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java @@ -5,10 +5,10 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java index ab057e6bdd20e..ee615b9c49c64 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/CookieTest.java @@ -4,10 +4,10 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.CookieParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java index 22d902c8e8406..2884a22184dc9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/HeaderTest.java @@ -4,12 +4,12 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.RestHeader; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ReactiveClientHeadersFromProviderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ReactiveClientHeadersFromProviderTest.java index e0c9eca9ca16c..d9837a5c16d1a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ReactiveClientHeadersFromProviderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ReactiveClientHeadersFromProviderTest.java @@ -8,17 +8,17 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -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.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UriUserInfoTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UriUserInfoTest.java index 63a52d6e85207..f667a89b8dae4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UriUserInfoTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UriUserInfoTest.java @@ -5,10 +5,10 @@ import java.net.URI; import java.util.Base64; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentFromConfigTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentFromConfigTest.java index 2fef92992e0d9..ad1cebe255e6e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentFromConfigTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentFromConfigTest.java @@ -4,10 +4,10 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java index d5341d80e3323..7ea164cbc1fdc 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java @@ -4,10 +4,10 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/CallMakingResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/CallMakingResource.java index 179b8694d4bef..98dd74be4b55c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/CallMakingResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/CallMakingResource.java @@ -2,8 +2,8 @@ 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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestClient.java index eb11e4cc192a3..4ed98b790e93a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestClient.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestResource.java index 994c3f1431be9..b3ae785a4c1f1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/lock/prevention/TestResource.java @@ -1,9 +1,9 @@ package io.quarkus.rest.client.reactive.lock.prevention; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/echo") @Produces("text/plain") diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteFileTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteFileTest.java index 5d470e36c27dc..2b7207f02fa15 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteFileTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteFileTest.java @@ -11,13 +11,13 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteWithRemoteErrorTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteWithRemoteErrorTest.java index 62ec116ddd5cb..f126dbc12ac5d 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteWithRemoteErrorTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultiByteWithRemoteErrorTest.java @@ -8,11 +8,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.core.MediaType; import org.assertj.core.api.Assertions; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartDetectionTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartDetectionTest.java index d07cb2b0c1733..ab0a0675b8de3 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartDetectionTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartDetectionTest.java @@ -8,11 +8,11 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java index 9723f6f38411a..e4e8aa704f800 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java @@ -12,12 +12,12 @@ import java.nio.file.Files; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.MultipartForm; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResource.java index 57ccd44263248..4ba9b879b6dac 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResource.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.multipart; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java index f89eae747a690..c616e4d102517 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java @@ -17,12 +17,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; @@ -144,7 +144,8 @@ void shouldBeSaneOnServerError() { @Test void shouldParseMultipartResponseWithClientBuilderApi() { - javax.ws.rs.client.Client client = ClientBuilder.newBuilder().register(new TestJacksonBasicMessageBodyReader()).build(); + jakarta.ws.rs.client.Client client = ClientBuilder.newBuilder().register(new TestJacksonBasicMessageBodyReader()) + .build(); MultipartDataForClientBuilder data = client.target(baseUri) .path("/give-me-file") .request(MediaType.MULTIPART_FORM_DATA) diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalFeature.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalFeature.java index 09b39085a2f96..bf3256e943817 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalFeature.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalFeature.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.provider; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilter.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilter.java index 57f2a95cf1657..35fcbaffa89c9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilter.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.provider; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilterConstrainedToServer.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilterConstrainedToServer.java index 815a7c28f7155..40e3e81649182 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilterConstrainedToServer.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalRequestFilterConstrainedToServer.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.provider; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestFilter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilter.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilter.java index b26bac87f264b..5501f20cca15b 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilter.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.provider; -import javax.annotation.Priority; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilterLowPrio.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilterLowPrio.java index 64fc0ae57d4ea..b0c7be8ea52bd 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilterLowPrio.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/GlobalResponseFilterLowPrio.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.provider; -import javax.annotation.Priority; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClient.java index d94255de56976..45922d2386f63 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClient.java @@ -1,11 +1,11 @@ package io.quarkus.rest.client.reactive.provider; -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 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 org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClientWithFilter.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClientWithFilter.java index 6c4ab9f666425..e8b8c34c0fd59 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClientWithFilter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/HelloClientWithFilter.java @@ -1,11 +1,11 @@ package io.quarkus.rest.client.reactive.provider; -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 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 org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java index 446574aa8840f..6c2816c37988a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java @@ -5,7 +5,7 @@ import java.net.URI; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java index 0925819afc6ac..2c03aadc6d100 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java @@ -3,7 +3,7 @@ import static io.quarkus.rest.client.reactive.RestClientTestUtil.setUrlForClass; import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java index 769819a1de649..ddea25d14ad13 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java @@ -5,7 +5,7 @@ import java.net.URI; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ResponseFilterLowestPrio.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ResponseFilterLowestPrio.java index d29961b978803..f56f2737cc17f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ResponseFilterLowestPrio.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ResponseFilterLowestPrio.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.provider; -import javax.annotation.Priority; -import javax.ws.rs.client.ClientResponseContext; +import jakarta.annotation.Priority; +import jakarta.ws.rs.client.ClientResponseContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientResponseFilter; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client1.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client1.java index 431ca5e5e2dc0..c1f1b2a4f94d5 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client1.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client1.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -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/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client2.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client2.java index 69422bf72b063..9520f28edcd9f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client2.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client2.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -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; @@ -11,4 +11,4 @@ public interface Client2 { @GET Response get(); -} \ No newline at end of file +} diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client3.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client3.java index 2f3b199c32e1e..6d9c1fe5e3a08 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client3.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client3.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -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; @@ -11,4 +11,4 @@ public interface Client3 { @GET Response get(); -} \ No newline at end of file +} diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client4.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client4.java index 4264d8d0ee965..dfb15b891fc9f 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client4.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client4.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -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; @@ -11,4 +11,4 @@ public interface Client4 { @GET Response get(); -} \ No newline at end of file +} diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client5.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client5.java index 35d7181208745..a67164f12eb93 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client5.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client5.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -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/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client6.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client6.java index 2eb7cb7c6d3a8..176c2c60e8c52 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client6.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/Client6.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -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/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/GlobalNonProxyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/GlobalNonProxyTest.java index 4dd2dcdb66146..36bb44192cbc8 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/GlobalNonProxyTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/GlobalNonProxyTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ProxyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ProxyTest.java index 8e3f10109129a..546f22d7b181b 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ProxyTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ProxyTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyTest.java index 6cd30d2b8d37f..97fec49f4c1c1 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyWithAuthTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyWithAuthTest.java index abd2f27960ce5..aba42f0ed6930 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyWithAuthTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/SystemPropertyProxyWithAuthTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ViaHeaderReturningResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ViaHeaderReturningResource.java index f7f0be450826a..981c197da0a57 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ViaHeaderReturningResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/proxy/ViaHeaderReturningResource.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.proxy; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; @Path("/resource") public class ViaHeaderReturningResource { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromMethodTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromMethodTest.java index 46c4ccd7cd6b8..84ff4c17268f6 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromMethodTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromMethodTest.java @@ -5,10 +5,10 @@ import java.net.URI; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromPropertyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromPropertyTest.java index 6d89f58bd23ac..9a1b73bbde01e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromPropertyTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/ClientQueryParamFromPropertyTest.java @@ -5,10 +5,10 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/QueryTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/QueryTest.java index 72bb9539f89e0..da08aa80ba3da 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/QueryTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/queries/QueryTest.java @@ -8,12 +8,12 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.RestQuery; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java index 69cd0aef08a92..9a580f2e5b7f0 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectTest.java @@ -4,7 +4,7 @@ import java.net.URI; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResource.java index c6f04fa55e96e..87c8edf04531c 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResource.java @@ -2,10 +2,10 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; @Path("/redirect") public class RedirectingResource { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResourceClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResourceClient.java index 88c1054c30d01..9340528da0b3a 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResourceClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/redirect/RedirectingResourceClient.java @@ -1,9 +1,9 @@ package io.quarkus.rest.client.reactive.redirect; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; @Path("/redirect") public interface RedirectingResourceClient { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java index a762f07496d1f..1910fc7d6e5e8 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java @@ -1,11 +1,11 @@ package io.quarkus.rest.client.reactive.registerclientheaders; -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.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderNoPassingClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderNoPassingClient.java index 6bd57afebe60c..f6485fc57ebfb 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderNoPassingClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderNoPassingClient.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.registerclientheaders; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java index c5f9683dc65a6..3c1338e102aec 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.registerclientheaders; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java index ef1df1794e015..d8d8e15ad9dd8 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.registerclientheaders; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MultipleHeadersBindingClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MultipleHeadersBindingClient.java index ebf9fc793e101..03353d82a3eb4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MultipleHeadersBindingClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MultipleHeadersBindingClient.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.registerclientheaders; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java index 79068e1a0695f..a9cacb810d20e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java index 2761245318095..8e719cdc98e16 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java @@ -1,15 +1,15 @@ package io.quarkus.rest.client.reactive.registerclientheaders; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +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.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java index e09df332d96db..8014a4b7a1f23 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/ssl/TrustAllTest.java @@ -6,8 +6,8 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.junit.jupiter.api.AfterEach; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloClient.java index 0d1db10a04d95..664dea477ef7d 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloClient.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloClient.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.stork; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloResource.java index d53f325fad23c..e9966a8d8eac6 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/HelloResource.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.stork; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello") public class HelloResource { diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/PassThroughResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/PassThroughResource.java index efb6a781befb1..129b7aece4cda 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/PassThroughResource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/PassThroughResource.java @@ -2,8 +2,8 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java index 32c92031137db..cb22c1393db59 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/stork/StorkIntegrationTest.java @@ -6,8 +6,8 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/Resource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/Resource.java index 653850c982c85..8b8c7199a5388 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/Resource.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/Resource.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestPath; import org.jboss.resteasy.reactive.RestQuery; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java index 53e6cc1d39fb1..05dfb552a2428 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/subresource/SubResourceTest.java @@ -4,16 +4,16 @@ import java.net.URI; -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.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +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.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; @@ -187,8 +187,8 @@ default String fillingMethod() { import io.quarkus.rest.client.reactive.subresource.SubResourceTest.RootClient; import io.quarkus.rest.client.reactive.subresource.SubResourceTest.SubClient; import java.io.Closeable; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Configurable; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Configurable; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; import org.eclipse.microprofile.rest.client.ext.DefaultClientHeadersFactoryImpl; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; @@ -252,13 +252,13 @@ public void close() { import io.quarkus.rest.client.reactive.HeaderFiller; import io.quarkus.rest.client.reactive.subresource.SubResourceTest.SubClient; import java.lang.reflect.Method; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; // $FF: synthetic class public class SubResourceTest$SubCliented77e297b94a7e0aa21c1f7f1d8ba4fbe72d61861 implements SubClient { @@ -374,7 +374,7 @@ public SubSubClient sub() { import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; // $FF: synthetic class diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java index 1c71a14260c12..e870bcf7b64ea 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/BuilderReadTimeoutTest.java @@ -9,11 +9,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -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.RestClientBuilder; import org.junit.jupiter.api.Test; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java index 8ae48ae9b94b9..572e22362bb82 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java @@ -7,11 +7,11 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeoutException; -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; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-classname-scope-test-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-classname-scope-test-application.properties index ed9ef1750a760..694d900b0b933 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-classname-scope-test-application.properties +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-classname-scope-test-application.properties @@ -1,2 +1,2 @@ io.quarkus.rest.client.reactive.HelloClientWithBaseUri/mp-rest/url=http://localhost:${quarkus.http.test-port:8081}/hello -io.quarkus.rest.client.reactive.HelloClientWithBaseUri/mp-rest/scope=javax.enterprise.context.Dependent +io.quarkus.rest.client.reactive.HelloClientWithBaseUri/mp-rest/scope=jakarta.enterprise.context.Dependent diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-configkey-scope-test-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-configkey-scope-test-application.properties index 97646d0fe4759..b2b1cc17be094 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-configkey-scope-test-application.properties +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-configkey-scope-test-application.properties @@ -1,2 +1,2 @@ hello2/mp-rest/url=http://localhost:${quarkus.http.test-port:8081}/hello -hello2/mp-rest/scope=javax.enterprise.context.Dependent +hello2/mp-rest/scope=jakarta.enterprise.context.Dependent diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-global-scope-test-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-global-scope-test-application.properties index 6f07cfa84ecef..d6de308a9245d 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-global-scope-test-application.properties +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/mp-global-scope-test-application.properties @@ -1,3 +1,3 @@ hello2/mp-rest/url=http://localhost:${quarkus.http.test-port:8081}/hello -quarkus.rest-client-reactive.scope=javax.enterprise.context.Dependent \ No newline at end of file +quarkus.rest-client-reactive.scope=jakarta.enterprise.context.Dependent \ No newline at end of file diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ClientExceptionMapper.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ClientExceptionMapper.java index cd2baed7a6deb..6541390621c05 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ClientExceptionMapper.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ClientExceptionMapper.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; /** * Used to easily define an exception mapper for the specific REST Client on which it's used. @@ -15,7 +15,7 @@ *
      *
    • Is a {@code static} method
      • *
    • Returns any subclass of {@link RuntimeException}
      • - *
    • Takes a single parameter of type {@link javax.ws.rs.core.Response}
      • + *
    • Takes a single parameter of type {@link jakarta.ws.rs.core.Response}
      • *
    * * An example method could look like the following: diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java index 8387d97aa612e..b58e0a563b5bb 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; public interface HeaderFiller { void addHeaders(MultivaluedMap headers); diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveClientHeadersFactory.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveClientHeadersFactory.java index 6b9440c36ced5..0f4981d8ebcc7 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveClientHeadersFactory.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveClientHeadersFactory.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/DefaultMicroprofileRestClientExceptionMapper.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/DefaultMicroprofileRestClientExceptionMapper.java index 27ff1f26787db..d4653cc190271 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/DefaultMicroprofileRestClientExceptionMapper.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/DefaultMicroprofileRestClientExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.rest.client.reactive.runtime; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderCapturingServerFilter.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderCapturingServerFilter.java index 5bf88d5e6cf22..d21a2dc739c19 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderCapturingServerFilter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderCapturingServerFilter.java @@ -1,7 +1,7 @@ package io.quarkus.rest.client.reactive.runtime; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; import io.quarkus.arc.Arc; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderContainer.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderContainer.java index dbbe78a54c5b0..b3266a5637cd0 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderContainer.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/HeaderContainer.java @@ -1,9 +1,9 @@ package io.quarkus.rest.client.reactive.runtime; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; @RequestScoped public class HeaderContainer { diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientRequestFilter.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientRequestFilter.java index 89982a4c8caaa..9f1600b450cea 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientRequestFilter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientRequestFilter.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.Map; -import javax.annotation.Priority; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientResponseFilter.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientResponseFilter.java index 4e45f007d551f..8e78ea877f6df 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientResponseFilter.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/MicroProfileRestClientResponseFilter.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.util.List; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; import org.jboss.resteasy.reactive.client.handlers.ClientResponseCompleteRestHandler; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/NoOpHeaderFiller.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/NoOpHeaderFiller.java index ddf42f7e81e5a..9ddeb280046ca 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/NoOpHeaderFiller.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/NoOpHeaderFiller.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive.runtime; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import io.quarkus.rest.client.reactive.HeaderFiller; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientBuilderImpl.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientBuilderImpl.java index a6f18ac1f16eb..2bd6b3f266a32 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientBuilderImpl.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientBuilderImpl.java @@ -14,9 +14,10 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.ext.ParamConverterProvider; + +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveCDIWrapperBase.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveCDIWrapperBase.java index 48db2cffd84ae..dfdbf373a1fb9 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveCDIWrapperBase.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveCDIWrapperBase.java @@ -3,7 +3,7 @@ import java.io.Closeable; import java.io.IOException; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.jboss.logging.Logger; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfig.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfig.java index 61dbfac51c30e..79a0abc931ed0 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfig.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfig.java @@ -15,10 +15,10 @@ public class RestClientReactiveConfig { /** - * Default scope for Rest Client Reactive. Use `javax.enterprise.context.Dependent` for spec-compliant behavior + * Default scope for Rest Client Reactive. Use `jakarta.enterprise.context.Dependent` for spec-compliant behavior */ @Deprecated // Deprecated in favour of RestClientsConfig.scope - @ConfigItem(name = "scope", defaultValue = "javax.enterprise.context.ApplicationScoped") + @ConfigItem(name = "scope", defaultValue = "jakarta.enterprise.context.ApplicationScoped") public String scope; /** @@ -33,7 +33,7 @@ public class RestClientReactiveConfig { public boolean disableSmartProduces; /** - * Whether providers (filters, etc.) annotated with {@link javax.ws.rs.ext.Provider} should be + * Whether providers (filters, etc.) annotated with {@link jakarta.ws.rs.ext.Provider} should be * automatically registered for all the clients in the application. */ @ConfigItem(name = "provider-autodiscovery", defaultValue = "true") diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ResteasyReactiveResponseExceptionMapper.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ResteasyReactiveResponseExceptionMapper.java index 2044d4c74f5b8..d421224cce34e 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ResteasyReactiveResponseExceptionMapper.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ResteasyReactiveResponseExceptionMapper.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive.runtime; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/devconsole/RestClientsContainer.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/devconsole/RestClientsContainer.java index 27c4e9eaec815..39d0945bf9c33 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/devconsole/RestClientsContainer.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/devconsole/RestClientsContainer.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.reactive.client.impl.ClientProxies; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/JsonMissingMessageBodyReaderErrorMessageContextualizer.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/JsonMissingMessageBodyReaderErrorMessageContextualizer.java index 1329d3fb51807..f5ffb518b63be 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/JsonMissingMessageBodyReaderErrorMessageContextualizer.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/JsonMissingMessageBodyReaderErrorMessageContextualizer.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive.runtime.spi; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.client.spi.MissingMessageBodyReaderErrorMessageContextualizer; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/XmlMissingMessageBodyReaderErrorMessageContextualizer.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/XmlMissingMessageBodyReaderErrorMessageContextualizer.java index 4b2c947a33b45..96927126ca442 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/XmlMissingMessageBodyReaderErrorMessageContextualizer.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/spi/XmlMissingMessageBodyReaderErrorMessageContextualizer.java @@ -1,6 +1,6 @@ package io.quarkus.rest.client.reactive.runtime.spi; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.client.spi.MissingMessageBodyReaderErrorMessageContextualizer; diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java index 9a0ec4493673d..2b913fc0870f0 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/test/java/io/quarkus/rest/client/reactive/runtime/RestClientCDIDelegateBuilderTest.java @@ -14,9 +14,10 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; + +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; diff --git a/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduled.java b/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduled.java index 6cf09848de944..c5e29a72e22bf 100644 --- a/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduled.java +++ b/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduled.java @@ -10,9 +10,9 @@ import java.time.Duration; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; diff --git a/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduler.java b/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduler.java index fc297e7930dd1..19ee33bcacb96 100644 --- a/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduler.java +++ b/extensions/scheduler/api/src/main/java/io/quarkus/scheduler/Scheduler.java @@ -10,7 +10,7 @@ /** * The container provides a built-in bean with bean type {@link Scheduler} and qualifier - * {@link javax.enterprise.inject.Default}. + * {@link jakarta.enterprise.inject.Default}. */ public interface Scheduler { diff --git a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipConcurrentExecutionInvoker.java b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipConcurrentExecutionInvoker.java index 1d687a8ad1e61..fc4a21906dbfb 100644 --- a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipConcurrentExecutionInvoker.java +++ b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipConcurrentExecutionInvoker.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.jboss.logging.Logger; diff --git a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipPredicateInvoker.java b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipPredicateInvoker.java index 344b36e65394b..7daf2c80234fc 100644 --- a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipPredicateInvoker.java +++ b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SkipPredicateInvoker.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.jboss.logging.Logger; diff --git a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/StatusEmitterInvoker.java b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/StatusEmitterInvoker.java index 5e941f7bfcfdd..9e9cfd7943188 100644 --- a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/StatusEmitterInvoker.java +++ b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/StatusEmitterInvoker.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.jboss.logging.Logger; diff --git a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SyntheticScheduled.java b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SyntheticScheduled.java index 1131d2f1e41ea..71865962e9f1d 100644 --- a/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SyntheticScheduled.java +++ b/extensions/scheduler/common/src/main/java/io/quarkus/scheduler/common/runtime/SyntheticScheduled.java @@ -3,7 +3,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; import io.quarkus.scheduler.Scheduled; @@ -80,4 +80,4 @@ public String overdueGracePeriod() { return overdueGracePeriod; } -} \ No newline at end of file +} diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ApplicationNotRunningPredicateTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ApplicationNotRunningPredicateTest.java index fec2c586fa292..5b2be1124ebdc 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ApplicationNotRunningPredicateTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ApplicationNotRunningPredicateTest.java @@ -6,8 +6,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; -import javax.interceptor.Interceptor; +import jakarta.enterprise.event.Observes; +import jakarta.interceptor.Interceptor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java index 15e0bacb13b7f..27290798d8c4a 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionSkipTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java index c6179cee519ba..0c1864bd0a45d 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java index 19448ba283b36..7dd3aebdcc7a8 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DisabledSchedulerTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java index 91011e4b3df72..e48de49107389 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateJobIdentityTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicatedContextTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicatedContextTest.java index 7088bcc3d562c..59cf446d4cc8c 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicatedContextTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicatedContextTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/FailedExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/FailedExecutionTest.java index 0e667e2cd7e8f..06b05885fd595 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/FailedExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/FailedExecutionTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/GetSchedulerJobsTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/GetSchedulerJobsTest.java index 4dbf1f858d52e..d9ba39edd4956 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/GetSchedulerJobsTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/GetSchedulerJobsTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java index ab5ad0e5c7068..b0308deeefb47 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidConditionalExecutionTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java index c9e1027e33c98..1b0b1beaae199 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidCronExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.scheduler.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java index da5bfbd5c239b..de243471726e9 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.scheduler.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java index 0419b71c4394d..56cbc8dffa64f 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidEveryExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.scheduler.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java index 9b302860d719b..53d18a141ff87 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidScheduledMethodTest.java @@ -1,6 +1,6 @@ package io.quarkus.scheduler.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java index c0d6484dc5050..7703679bfa05e 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/NoExpressionTest.java @@ -1,6 +1,6 @@ package io.quarkus.scheduler.test; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueCronExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueCronExecutionTest.java index 7e868b8e4445e..b8f29bead70de 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueCronExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueCronExecutionTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueExecutionTest.java index 9eebf27f9026b..bf41b92277ac4 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/OverdueExecutionTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java index c7d0fd30bdde7..d7e558630c5e0 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodExpressionTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.interceptor.Interceptor; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java index a2d0ed643a2cf..232fa648e2caf 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedMethodTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java index de9d1f41805ce..fd9999c9f834f 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedResumedMethodTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java index fbbb63df766f9..750cf3a766743 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestContextJobs.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestContextJobs.java index bb860c52eedbf..15bc3f8492783 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestContextJobs.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/RequestContextJobs.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import io.quarkus.scheduler.Scheduled; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SuccessfulExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SuccessfulExecutionTest.java index a103ac369e27b..314534567bbc8 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SuccessfulExecutionTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SuccessfulExecutionTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java index 0a3795835a988..02d5eeb1003a4 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java @@ -1,7 +1,7 @@ package io.quarkus.scheduler.test.devconsole; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.configuration.ConfigInstantiator; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java index 4b8416d89267d..9440d55af59e5 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java @@ -3,7 +3,7 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.quarkus.scheduler.Scheduled; import io.vertx.core.Handler; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/inheritance/ScheduledMethodNotInheritedTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/inheritance/ScheduledMethodNotInheritedTest.java index 5b33501cde53e..2a7f0e1f69794 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/inheritance/ScheduledMethodNotInheritedTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/inheritance/ScheduledMethodNotInheritedTest.java @@ -7,7 +7,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java index b38d4285121bb..ba907733db9a1 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/metrics/MicrometerTimedTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.awaitility.Awaitility; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/nonblocking/NonBlockingScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/nonblocking/NonBlockingScheduledMethodTest.java index 2ddbbc58e735d..516144d8958f4 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/nonblocking/NonBlockingScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/nonblocking/NonBlockingScheduledMethodTest.java @@ -13,10 +13,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ForcedStartModeJobsTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ForcedStartModeJobsTest.java index 622f497d23d04..0239c6ab73fbc 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ForcedStartModeJobsTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ForcedStartModeJobsTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/HaltedStartModeJobsTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/HaltedStartModeJobsTest.java index 6097bba9a1e73..4ace83d3f783e 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/HaltedStartModeJobsTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/HaltedStartModeJobsTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ProgrammaticJobsTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ProgrammaticJobsTest.java index b0695789216ee..e31c01a1aeb83 100644 --- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ProgrammaticJobsTest.java +++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/programmatic/ProgrammaticJobsTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/scheduler/kotlin/src/main/kotlin/io/quarkus/scheduler/kotlin/runtime/ApplicationCoroutineScope.kt b/extensions/scheduler/kotlin/src/main/kotlin/io/quarkus/scheduler/kotlin/runtime/ApplicationCoroutineScope.kt index 96dfed1db77a8..1b779f661bd53 100644 --- a/extensions/scheduler/kotlin/src/main/kotlin/io/quarkus/scheduler/kotlin/runtime/ApplicationCoroutineScope.kt +++ b/extensions/scheduler/kotlin/src/main/kotlin/io/quarkus/scheduler/kotlin/runtime/ApplicationCoroutineScope.kt @@ -1,10 +1,10 @@ package io.quarkus.scheduler.kotlin.runtime +import jakarta.annotation.PreDestroy +import jakarta.inject.Singleton import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel -import javax.annotation.PreDestroy -import javax.inject.Singleton import kotlin.coroutines.CoroutineContext @Singleton diff --git a/extensions/scheduler/runtime/pom.xml b/extensions/scheduler/runtime/pom.xml index 28fb25d899677..d2bbc8257e621 100644 --- a/extensions/scheduler/runtime/pom.xml +++ b/extensions/scheduler/runtime/pom.xml @@ -30,8 +30,8 @@ slf4j-jboss-logmanager - org.glassfish - jakarta.el + org.glassfish.expressly + expressly diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java index 141207f9f3bf5..9c70587c2f294 100644 --- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java +++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java @@ -17,14 +17,14 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Typed; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Typed; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; import org.jboss.logging.Logger; import org.jboss.threads.JBossScheduledThreadPoolExecutor; diff --git a/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java b/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java index 706bce494bbc6..0c0e15e6c725a 100644 --- a/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java +++ b/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java @@ -8,9 +8,9 @@ import java.util.Set; import java.util.function.BiConsumer; -import javax.inject.Singleton; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.inject.Singleton; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.Session; import org.hibernate.SimpleNaturalIdLoadAccess; diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BCryptUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BCryptUserEntity.java index e4b9d8b5ff467..66563f39145be 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BCryptUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/BCryptUserEntity.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @UserDefinition @Table(name = "test_user") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java index 7c01ea35bb754..75196d2c45f64 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java @@ -1,6 +1,6 @@ package io.quarkus.security.jpa; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import org.wildfly.security.password.Password; import org.wildfly.security.password.interfaces.SimpleDigestPassword; diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java index f5d24c3188af1..8362de9ae40d9 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @UserDefinition @Table(name = "test_user") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ExternalRolesUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ExternalRolesUserEntity.java index 890ff67b40719..6a62d63241066 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ExternalRolesUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ExternalRolesUserEntity.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @UserDefinition @Table(name = "test_user") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalUserEntity.java index f2392c935b288..12c09489217fe 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MinimalUserEntity.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @UserDefinition @Table(name = "test_user") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionUserEntity.java index f9b8dafee050e..49a4f8a7b0c08 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesInCollectionUserEntity.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; @UserDefinition @Table(name = "test_user") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesUserEntity.java index 26a7f5b9dc580..ee0d81608e693 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/MultipleRolesUserEntity.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @UserDefinition @Table(name = "test_user") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdUserEntity.java index 76b7294075e59..86218d63eb648 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/NaturalIdUserEntity.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheRoleEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheRoleEntity.java index f928f77b1bb60..ab99ace1e8b86 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheRoleEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheRoleEntity.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheUserEntity.java index 25edc44af77f1..8d67be4740a15 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PanacheUserEntity.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ParametrizedPathsResource.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ParametrizedPathsResource.java index 48027e12c52aa..512defbd5c43d 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ParametrizedPathsResource.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/ParametrizedPathsResource.java @@ -1,9 +1,9 @@ package io.quarkus.security.jpa; -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; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PlainUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PlainUserEntity.java index 1543ddca2afbf..ba3d514e7c28d 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PlainUserEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/PlainUserEntity.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RoleEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RoleEntity.java index 30869aa499465..a40297ed6e04b 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RoleEntity.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RoleEntity.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Table(name = "test_role") @Entity diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RolesEndpointClassLevel.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RolesEndpointClassLevel.java index c042f0eeda6a7..d1585c21ee309 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RolesEndpointClassLevel.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/RolesEndpointClassLevel.java @@ -1,10 +1,10 @@ package io.quarkus.security.jpa; -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; /** * Test JAXRS endpoint with RolesAllowed specified at the class level diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SingleRoleSecuredServlet.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SingleRoleSecuredServlet.java index d3266741dacb6..683c46a8dc5fb 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SingleRoleSecuredServlet.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SingleRoleSecuredServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic secured servlet test target diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SubjectExposingResource.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SubjectExposingResource.java index 58bee3d18d022..2c6016c940f70 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SubjectExposingResource.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/SubjectExposingResource.java @@ -2,14 +2,14 @@ import java.security.Principal; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -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.PermitAll; +import jakarta.annotation.security.RolesAllowed; +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; @Path("subject") public class SubjectExposingResource { diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/TestApplication.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/TestApplication.java index 5cb6b3d09d095..61ef7bfd0a21c 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/TestApplication.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/TestApplication.java @@ -1,8 +1,8 @@ package io.quarkus.security.jpa; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationScoped @ApplicationPath("/jaxrs-secured") diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/UserEntityIdentityProvider.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/UserEntityIdentityProvider.java index 5fa621a5d7e97..43729afa3434f 100644 --- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/UserEntityIdentityProvider.java +++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/UserEntityIdentityProvider.java @@ -1,7 +1,7 @@ package io.quarkus.security.jpa; -import javax.inject.Singleton; -import javax.persistence.EntityManager; +import jakarta.inject.Singleton; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.SimpleNaturalIdLoadAccess; diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java index 45fa5d261fbc5..4d7cc8b754a07 100644 --- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java +++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java @@ -3,7 +3,7 @@ import java.security.spec.InvalidKeySpecException; import java.util.List; -import javax.persistence.Query; +import jakarta.persistence.Query; import org.wildfly.security.credential.PasswordCredential; import org.wildfly.security.evidence.PasswordGuessEvidence; diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java index 8084098db9eea..e2f06063b15cb 100644 --- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java +++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.FlushMode; import org.jboss.logging.Logger; diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java index c966a4a50f351..9f93c7e4bc8b3 100644 --- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java +++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.FlushMode; import org.jboss.logging.Logger; diff --git a/extensions/security-webauthn/deployment/src/main/java/io/quarkus/security/webauthn/deployment/QuarkusSecurityWebAuthnProcessor.java b/extensions/security-webauthn/deployment/src/main/java/io/quarkus/security/webauthn/deployment/QuarkusSecurityWebAuthnProcessor.java index cb2da92bed7b0..64a531b612357 100644 --- a/extensions/security-webauthn/deployment/src/main/java/io/quarkus/security/webauthn/deployment/QuarkusSecurityWebAuthnProcessor.java +++ b/extensions/security-webauthn/deployment/src/main/java/io/quarkus/security/webauthn/deployment/QuarkusSecurityWebAuthnProcessor.java @@ -2,7 +2,7 @@ import java.util.function.BooleanSupplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/ManualResource.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/ManualResource.java index b38089b3c6bff..8d2f628d426b4 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/ManualResource.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/ManualResource.java @@ -1,9 +1,9 @@ package io.quarkus.security.webauthn.test; -import javax.inject.Inject; -import javax.ws.rs.BeanParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import io.quarkus.security.webauthn.WebAuthnLoginResponse; import io.quarkus.security.webauthn.WebAuthnRegisterResponse; diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/TestResource.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/TestResource.java index 369fc9b143e55..f1415255f31c8 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/TestResource.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/TestResource.java @@ -1,9 +1,9 @@ package io.quarkus.security.webauthn.test; -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.Authenticated; import io.quarkus.security.identity.SecurityIdentity; @@ -40,4 +40,4 @@ public String hello() { return "Hello"; } -} \ No newline at end of file +} diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnAutomaticTest.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnAutomaticTest.java index e7e9c2930e2ae..696b1bb5481a7 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnAutomaticTest.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnAutomaticTest.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnBlockingTestUserProvider.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnBlockingTestUserProvider.java index d9b4b0d74d0f5..de755e7cd41be 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnBlockingTestUserProvider.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnBlockingTestUserProvider.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; @@ -40,4 +40,4 @@ private void assertBlockingAllowed() { throw new RuntimeException("Blocking is not allowed"); } -} \ No newline at end of file +} diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTest.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTest.java index fa261dcab99c8..b9c86917c9a4a 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTest.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTest.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTestUserProvider.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTestUserProvider.java index afbb6f511bd96..65ae0801fdd95 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTestUserProvider.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnManualTestUserProvider.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.Arc; import io.quarkus.security.webauthn.WebAuthnSecurity; @@ -44,4 +44,4 @@ private void assertRequestContext() { throw new AssertionError("Request context not active"); } } -} \ No newline at end of file +} diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnNonBlockingTestUserProvider.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnNonBlockingTestUserProvider.java index cfdac7120748e..1ce44c088ed52 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnNonBlockingTestUserProvider.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnNonBlockingTestUserProvider.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnStoringTestUserProvider.java b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnStoringTestUserProvider.java index cd8c93f12d84a..bc48fc3825649 100644 --- a/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnStoringTestUserProvider.java +++ b/extensions/security-webauthn/deployment/src/test/java/io/quarkus/security/webauthn/test/WebAuthnStoringTestUserProvider.java @@ -1,6 +1,6 @@ package io.quarkus.security.webauthn.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.test.security.webauthn.WebAuthnTestUserProvider; @@ -9,4 +9,4 @@ */ @ApplicationScoped public class WebAuthnStoringTestUserProvider extends WebAuthnTestUserProvider { -} \ No newline at end of file +} diff --git a/extensions/security-webauthn/runtime/pom.xml b/extensions/security-webauthn/runtime/pom.xml index b23cb72a2c3c8..5ecfbe27820c9 100644 --- a/extensions/security-webauthn/runtime/pom.xml +++ b/extensions/security-webauthn/runtime/pom.xml @@ -15,8 +15,8 @@ Secure your applications with WebAuthn - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api io.quarkus diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnAuthenticatorStorage.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnAuthenticatorStorage.java index 6a09aa720895c..6ae86cc80ef8d 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnAuthenticatorStorage.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnAuthenticatorStorage.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.runtime.BlockingOperationControl; import io.smallrye.common.annotation.Blocking; @@ -64,4 +64,4 @@ public Future updater(Authenticator authenticator) { .fromCompletionStage(runPotentiallyBlocking(() -> userProvider.updateOrStoreWebAuthnCredentials(authenticator)) .subscribeAsCompletionStage()); } -} \ No newline at end of file +} diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnIdentityProvider.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnIdentityProvider.java index c13ff30783e8a..8e1e62fffdd9a 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnIdentityProvider.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnIdentityProvider.java @@ -2,8 +2,8 @@ import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.security.identity.AuthenticationRequestContext; import io.quarkus.security.identity.IdentityProvider; diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnLoginResponse.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnLoginResponse.java index 0dd341d42b866..0e9a01aec89cf 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnLoginResponse.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnLoginResponse.java @@ -1,7 +1,7 @@ package io.quarkus.security.webauthn; -import javax.ws.rs.BeanParam; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.FormParam; import io.vertx.core.json.JsonObject; diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnRegisterResponse.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnRegisterResponse.java index 3c269a9aa7009..a9aff9820a466 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnRegisterResponse.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnRegisterResponse.java @@ -1,7 +1,7 @@ package io.quarkus.security.webauthn; -import javax.ws.rs.BeanParam; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.FormParam; import io.vertx.core.json.JsonObject; diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnResponse.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnResponse.java index 5ebe867be623d..08aa639594b79 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnResponse.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnResponse.java @@ -1,7 +1,7 @@ package io.quarkus.security.webauthn; -import javax.ws.rs.BeanParam; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.FormParam; import io.vertx.core.json.JsonObject; @@ -78,4 +78,4 @@ && notEmpty(webAuthnType) private boolean notEmpty(String value) { return value != null && !value.isBlank(); } -} \ No newline at end of file +} diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnSecurity.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnSecurity.java index 095d4e932c836..e76f5554e6a90 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnSecurity.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnSecurity.java @@ -2,8 +2,8 @@ import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.security.runtime.QuarkusPrincipal; import io.quarkus.security.runtime.QuarkusSecurityIdentity; diff --git a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnTrustedIdentityProvider.java b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnTrustedIdentityProvider.java index 934814154b163..46f4da269293c 100644 --- a/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnTrustedIdentityProvider.java +++ b/extensions/security-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnTrustedIdentityProvider.java @@ -1,7 +1,7 @@ package io.quarkus.security.webauthn; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.security.identity.AuthenticationRequestContext; import io.quarkus.security.identity.IdentityProvider; diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/DotNames.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/DotNames.java index 4d8b012b02574..84936f9cd1746 100644 --- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/DotNames.java +++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/DotNames.java @@ -1,8 +1,8 @@ package io.quarkus.security.deployment; -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.jboss.jandex.DotName; diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityAnnotationsRegistrar.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityAnnotationsRegistrar.java index cec64a54bb41d..f95401701393c 100644 --- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityAnnotationsRegistrar.java +++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityAnnotationsRegistrar.java @@ -3,9 +3,9 @@ import java.util.Collections; 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.arc.processor.InterceptorBindingRegistrar; import io.quarkus.security.Authenticated; diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java index 924c0ed173d62..52667fd8878d9 100644 --- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java +++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java @@ -27,7 +27,7 @@ import java.util.function.Function; import java.util.function.Predicate; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityTransformerUtils.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityTransformerUtils.java index 4ca0dfa8b2517..8092a41a31bca 100644 --- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityTransformerUtils.java +++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityTransformerUtils.java @@ -5,8 +5,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/BeanWithSecuredFinalMethod.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/BeanWithSecuredFinalMethod.java index bee22955535f4..a0f85220d30da 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/BeanWithSecuredFinalMethod.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/BeanWithSecuredFinalMethod.java @@ -1,8 +1,8 @@ package io.quarkus.security.test.cdi; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Singleton; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; @Singleton public class BeanWithSecuredFinalMethod { diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java index 6bc1ef4f5c466..fd34fbc3890ba 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDefaultTest.java @@ -8,8 +8,8 @@ import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java index 4f34cbf3d212b..8859182433f28 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/CDIAccessDenyUnannotatedTest.java @@ -6,8 +6,8 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/InvalidBean.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/InvalidBean.java index 8d3285c871431..39ae0c53abc80 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/InvalidBean.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/InvalidBean.java @@ -1,7 +1,7 @@ package io.quarkus.security.test.cdi; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.security.Authenticated; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java index a13317ae10281..96d9f64814dec 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodTest.java @@ -6,7 +6,7 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java index 9cfc7b8baa152..ebc7c8ce0ece2 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/SecurityAnnotationOnFinalMethodWithDisableFinalRemovalTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java index db457825b0fef..a3447479007bd 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/BeanWithSecuredMethods.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import io.smallrye.mutiny.Uni; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithDenyAll.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithDenyAll.java index a65280b7ed0dc..16718d5da9d5c 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithDenyAll.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithDenyAll.java @@ -1,10 +1,10 @@ package io.quarkus.security.test.cdi.app; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithPermitAll.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithPermitAll.java index 67ce51a5a68a2..87d0879d52a03 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithPermitAll.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithPermitAll.java @@ -1,9 +1,9 @@ package io.quarkus.security.test.cdi.app; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithoutAnnotations.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithoutAnnotations.java index 3b78c67f5b8d7..8a2f0e129f69d 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithoutAnnotations.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/SubclassWithoutAnnotations.java @@ -1,6 +1,6 @@ package io.quarkus.security.test.cdi.app; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithNoSecurityAnnotations.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithNoSecurityAnnotations.java index 4b8e286f245a3..cec8254847f52 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithNoSecurityAnnotations.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithNoSecurityAnnotations.java @@ -1,6 +1,6 @@ package io.quarkus.security.test.cdi.app.denied.unnanotated; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotations.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotations.java index fcd0105858094..dc076a946b12c 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotations.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotations.java @@ -1,9 +1,9 @@ package io.quarkus.security.test.cdi.app.denied.unnanotated; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotationsSubBean.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotationsSubBean.java index 733c4798aef33..f281ac5dadfba 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotationsSubBean.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/BeanWithSecurityAnnotationsSubBean.java @@ -1,6 +1,6 @@ package io.quarkus.security.test.cdi.app.denied.unnanotated; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllBean.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllBean.java index f0bcdea1f2160..dff8162a6fa95 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllBean.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllBean.java @@ -1,7 +1,7 @@ package io.quarkus.security.test.cdi.app.denied.unnanotated; -import javax.annotation.security.PermitAll; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.PermitAll; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllSubBean.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllSubBean.java index 26c7f10dd2f9f..6afeed1c96638 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllSubBean.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/cdi/app/denied/unnanotated/PermitAllSubBean.java @@ -1,7 +1,7 @@ package io.quarkus.security.test.cdi.app.denied.unnanotated; -import javax.annotation.security.DenyAll; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.DenyAll; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java index 945e0b93fc5b6..0f8de64952245 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/ConfigExpressionDetectionTest.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; import org.jboss.jandex.DotName; import org.jboss.jandex.Indexer; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionFailureTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionFailureTest.java index 2a7d3b83a7357..d3e15789ed093 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionFailureTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionFailureTest.java @@ -5,8 +5,8 @@ import java.util.NoSuchElementException; -import javax.annotation.security.RolesAllowed; -import javax.inject.Singleton; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionTest.java b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionTest.java index 055c5f5cb79f3..be0c7df88482b 100644 --- a/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionTest.java +++ b/extensions/security/deployment/src/test/java/io/quarkus/security/test/rolesallowed/RolesAllowedExpressionTest.java @@ -8,9 +8,9 @@ import java.util.Collections; import java.util.Set; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/AuthorizationController.java b/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/AuthorizationController.java index 97c441257d855..49797b54ce31c 100644 --- a/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/AuthorizationController.java +++ b/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/AuthorizationController.java @@ -1,6 +1,6 @@ package io.quarkus.security.spi.runtime; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** * controller that allows authorization to be disabled in tests. diff --git a/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/DevModeDisabledAuthorizationController.java b/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/DevModeDisabledAuthorizationController.java index e9489f9680a4c..0da96a6517621 100644 --- a/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/DevModeDisabledAuthorizationController.java +++ b/extensions/security/runtime-spi/src/main/java/io/quarkus/security/spi/runtime/DevModeDisabledAuthorizationController.java @@ -1,9 +1,9 @@ package io.quarkus.security.spi.runtime; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; import io.quarkus.runtime.LaunchMode; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/IdentityProviderManagerCreator.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/IdentityProviderManagerCreator.java index 9a9fe8bed9236..b01c758d87f78 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/IdentityProviderManagerCreator.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/IdentityProviderManagerCreator.java @@ -2,10 +2,10 @@ import java.util.concurrent.Executor; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import io.quarkus.runtime.ExecutorRecorder; import io.quarkus.security.identity.IdentityProvider; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java index aa41696fc5a37..3539d89d63256 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java @@ -2,9 +2,9 @@ import java.security.Principal; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import io.quarkus.runtime.BlockingOperationControl; import io.quarkus.runtime.BlockingOperationNotAllowedException; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityProxy.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityProxy.java index e0aaef21892fe..26c4fe57b9ae6 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityProxy.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityProxy.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import io.quarkus.security.credential.Credential; import io.quarkus.security.identity.SecurityIdentity; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/X509IdentityProvider.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/X509IdentityProvider.java index 37e990aa4b60b..ae1ff274da163 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/X509IdentityProvider.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/X509IdentityProvider.java @@ -2,7 +2,7 @@ import java.security.cert.X509Certificate; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.security.identity.AuthenticationRequestContext; import io.quarkus.security.identity.IdentityProvider; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/AuthenticatedInterceptor.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/AuthenticatedInterceptor.java index 59aa863b2bc73..8563b0c5df0d2 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/AuthenticatedInterceptor.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/AuthenticatedInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.security.runtime.interceptor; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.security.Authenticated; import io.quarkus.security.spi.runtime.AuthorizationController; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java index 66f92e3ec1449..85db011c87aeb 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java @@ -1,11 +1,11 @@ package io.quarkus.security.runtime.interceptor; -import javax.annotation.Priority; -import javax.annotation.security.DenyAll; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.annotation.security.DenyAll; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.security.spi.runtime.AuthorizationController; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/PermitAllInterceptor.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/PermitAllInterceptor.java index fd6eb5fe25dfd..8fedc6b2bf6e2 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/PermitAllInterceptor.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/PermitAllInterceptor.java @@ -1,11 +1,11 @@ package io.quarkus.security.runtime.interceptor; -import javax.annotation.Priority; -import javax.annotation.security.PermitAll; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.annotation.security.PermitAll; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/RolesAllowedInterceptor.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/RolesAllowedInterceptor.java index a0931f204fa38..d81d5c95fee99 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/RolesAllowedInterceptor.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/RolesAllowedInterceptor.java @@ -1,11 +1,11 @@ package io.quarkus.security.runtime.interceptor; -import javax.annotation.Priority; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.security.spi.runtime.AuthorizationController; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityConstrainer.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityConstrainer.java index cd1dc9c248078..72da6f9855c9f 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityConstrainer.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityConstrainer.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import io.quarkus.runtime.BlockingOperationNotAllowedException; import io.quarkus.security.runtime.SecurityIdentityAssociation; diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java index 6c960be600c19..1819382ed76f2 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/SecurityHandler.java @@ -6,9 +6,9 @@ import java.util.concurrent.CompletionStage; import java.util.function.Function; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.InvocationContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.InvocationContext; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; diff --git a/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredMethodsBuildItem.java b/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredMethodsBuildItem.java index 9064542782189..244f69b17dbda 100644 --- a/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredMethodsBuildItem.java +++ b/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredMethodsBuildItem.java @@ -10,8 +10,8 @@ import io.quarkus.builder.item.MultiBuildItem; /** - * Contains methods that need to have {@link javax.annotation.security.DenyAll} or - * {@link javax.annotation.security.RolesAllowed}. + * Contains methods that need to have {@link jakarta.annotation.security.DenyAll} or + * {@link jakarta.annotation.security.RolesAllowed}. */ public final class AdditionalSecuredMethodsBuildItem extends MultiBuildItem { diff --git a/extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java b/extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java index 34d5452a4d49d..3ef23c2c71644 100644 --- a/extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java +++ b/extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java @@ -5,9 +5,9 @@ import java.util.HashSet; import java.util.Set; -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.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/IdentityMock.java b/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/IdentityMock.java index 7788d521bfcc1..edac1922ca3e9 100644 --- a/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/IdentityMock.java +++ b/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/IdentityMock.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; import io.quarkus.security.credential.Credential; import io.quarkus.security.identity.SecurityIdentity; diff --git a/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/TestIdentityProvider.java b/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/TestIdentityProvider.java index 6b3dee03c03c3..f1985097d4d92 100644 --- a/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/TestIdentityProvider.java +++ b/extensions/security/test-utils/src/main/java/io/quarkus/security/test/utils/TestIdentityProvider.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.security.AuthenticationFailedException; import io.quarkus.security.identity.AuthenticationRequestContext; diff --git a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java index 8141b68e431f2..bcbe69dda868f 100644 --- a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java +++ b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java index 06d4bb3cf3bab..c0111ad5103fa 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.context.deployment.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java index 299069b620bb0..a042250e1f24f 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.context.deployment.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java index 5ed8978d4caed..e043b7b46128b 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.context.deployment.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ConfiguredAndSharedBeansTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ConfiguredAndSharedBeansTest.java index 0c47996e5401c..6f007ef980060 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ConfiguredAndSharedBeansTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ConfiguredAndSharedBeansTest.java @@ -17,11 +17,11 @@ import java.lang.annotation.Target; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderDisabledTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderDisabledTest.java index 6ba2ed04c67e5..cfc4bdf74635b 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderDisabledTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderDisabledTest.java @@ -8,10 +8,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderEnabledTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderEnabledTest.java index e94c8e67f941d..4781c93aaf064 100644 --- a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderEnabledTest.java +++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/cdi/ContextProviderEnabledTest.java @@ -7,9 +7,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java index d47a7f087cd2a..460e86abc8e91 100644 --- a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java +++ b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.context.runtime; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.eclipse.microprofile.context.ThreadContext; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java index 116ec5aafb708..2ce17873fb303 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java @@ -12,8 +12,8 @@ import java.util.Queue; import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.spi.DefinitionException; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ObjectBeanTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ObjectBeanTest.java index 7845cd2978354..f0ee276482f16 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ObjectBeanTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ObjectBeanTest.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.faulttolerance.test; -import javax.enterprise.inject.Produces; -import javax.inject.Named; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousBean.java index c8941228b21a4..bba152652989a 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousBean.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Asynchronous; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousTest.java index cac16e37757f5..b8c0aa2d6e98f 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/AsynchronousTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingService.java index 21aa19c0decec..143bc0ab6992c 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingService.java @@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Fallback; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingTest.java index 0300444d56cc7..c0312fb8f0841 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/AsyncNonBlockingTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassService.java index d4c7c60cc709a..42d83d371b827 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassService.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java index ab0145fbe33de..1d5bff10f804b 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnClassTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodService.java index fe945d873b067..ac0ab096cdc7f 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodService.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java index 6b7cd8564de68..6f59fa2d8d312 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingNonBlockingOnMethodTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingService.java index 3282e12ed022d..079497679b66c 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingService.java @@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Fallback; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingTest.java index 61fe16a1799c5..3d4fa2348fecd 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BlockingTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassService.java index c1909ff1c859c..bf20b468da966 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassService.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassTest.java index f6ea91db3818a..9a99295ca64c9 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnClassTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodService.java index a864c27ad0d3a..2c6f41e30de03 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodService.java @@ -2,7 +2,7 @@ import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodTest.java index c813e95a6a6be..9bcce6422442b 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/BothAsyncOnMethodTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingService.java index 94eed372201db..49e7895249086 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingService.java @@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Fallback; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingTest.java index 26c5db69d9b8e..d3d1ec58607a7 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/additional/NonblockingTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java index 1abf6f690d336..05a40d244b0d5 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/context/propagation/FaultToleranceContextPropagationTest.java @@ -6,10 +6,10 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.faulttolerance.Asynchronous; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingService.java index b9ed038d3d0d4..9088f96ffe61f 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingService.java @@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Fallback; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingTest.java index e1a13b59e1011..6fc6f6553efba 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/noncompat/NoncompatNonblockingTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java index 6613d19824e24..5b96ce0f33ca0 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyFaultToleranceTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyHelloService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyHelloService.java index dc11cfda51d5a..4827cb9bccaa7 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyHelloService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/MutinyHelloService.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyHelloService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyHelloService.java index d3a478a2de7e4..dbec5fb1f307b 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyHelloService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyHelloService.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyResubscriptionTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyResubscriptionTest.java index edae12627710b..2cd195f94934a 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyResubscriptionTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/asynchronous/types/mutiny/resubscription/MutinyResubscriptionTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadBean.java index 87c9eef887091..70348a368be3a 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadBean.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Bulkhead; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadTest.java index b68b9c870f6e6..83269756c5a7d 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/bukhead/BulkheadTest.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.BulkheadException; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerBean.java index d6e6122634858..6a8fcb27e5ce9 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerBean.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerTest.java index 147f8126714dc..dd5790d6c56e8 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/CircuitBreakerTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.CircuitBreakerOpenException; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java index c0c90ac9229c7..160e0d396ba18 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/CircuitBreakerNameInheritanceTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SubCircuitBreakerService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SubCircuitBreakerService.java index 2373d53519bad..b2f26bbc454a1 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SubCircuitBreakerService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SubCircuitBreakerService.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.circuitbreaker.maintenance.duplicate; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SuperCircuitBreakerService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SuperCircuitBreakerService.java index 81f6be2e82a1c..0a87d76f87b20 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SuperCircuitBreakerService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/duplicate/SuperCircuitBreakerService.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.circuitbreaker.maintenance.duplicate; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService1.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService1.java index 289330a7cbea7..687f50da09b0b 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService1.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService1.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.circuitbreaker.maintenance.inheritance; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService2.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService2.java index 63d26cfa9e0d2..94d7be6f34af0 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService2.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/CircuitBreakerService2.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.circuitbreaker.maintenance.inheritance; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java index 9dbd7a493db49..c5bb50252ed96 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/circuitbreaker/maintenance/inheritance/DuplicateCircuitBreakerNameTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackBean.java index b648dfba07862..d135a8d68663f 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackBean.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.fallback; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.ExecutionContext; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackTest.java index 25630e725bf43..8b4ab23ba0eeb 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/fallback/FallbackTest.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.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/HelloService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/HelloService.java index 1ea8872387016..62d04c395ab0d 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/HelloService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/HelloService.java @@ -3,7 +3,7 @@ import java.time.temporal.ChronoUnit; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/ProgrammaticCircuitBreakerTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/ProgrammaticCircuitBreakerTest.java index 828948eef9faa..07484392b4adc 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/ProgrammaticCircuitBreakerTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/programmatic/ProgrammaticCircuitBreakerTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.CircuitBreakerOpenException; import org.junit.jupiter.api.BeforeEach; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitBean.java index 77505f9672eef..9c078742630ca 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitBean.java @@ -3,7 +3,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.smallrye.faulttolerance.api.RateLimit; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitTest.java index 8066bc448a6f2..27e24c8a764ba 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/ratelimit/RateLimitTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryBean.java index 51a00cbfac4ef..7cc4f5e55d573 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryBean.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryTest.java index 01781902d5f34..f403e1bd46ceb 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/RetryTest.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.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffService.java index 42d90507219e7..911bbfbd41789 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffService.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.retry.backoff; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java index d7a7f4ffeb13c..b31e6f1b909f2 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/ClassAndMethodBackoffTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodService.java index 15c795ff0bcd7..774e08be3faee 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodService.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.retry.backoff; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java index 6003921736505..cc7020b34aa66 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnClassBackoffOnMethodTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassService.java index fbcd7093d7746..7cf3ef5d9d85a 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassService.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.retry.backoff; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java index b4c9e742fab3c..34d90f8a34498 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/RetryOnMethodBackoffOnClassTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodService.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodService.java index 45a58027ba6b4..236fae795b5ee 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodService.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodService.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.retry.backoff; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java index dd864e66b9b24..360337fce5c66 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/retry/backoff/TwoBackoffsOnMethodTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutBean.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutBean.java index 96e093706be72..f0ca2747c176f 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutBean.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutBean.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.test.timeout; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Timeout; diff --git a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutTest.java b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutTest.java index e4c5290468e6b..42982a9504a8c 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutTest.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/test/java/io/quarkus/smallrye/faulttolerance/test/timeout/TimeoutTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusAsyncExecutorProvider.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusAsyncExecutorProvider.java index 912997e4699e9..edc65951e2a39 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusAsyncExecutorProvider.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusAsyncExecutorProvider.java @@ -2,10 +2,10 @@ import java.util.concurrent.ExecutorService; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.context.ManagedExecutor; diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusExistingCircuitBreakerNames.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusExistingCircuitBreakerNames.java index bd90f59dd3452..8386937f462f1 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusExistingCircuitBreakerNames.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusExistingCircuitBreakerNames.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Singleton; import io.smallrye.faulttolerance.ExistingCircuitBreakerNames; diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFallbackHandlerProvider.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFallbackHandlerProvider.java index f807114ab8756..21211cca75e46 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFallbackHandlerProvider.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFallbackHandlerProvider.java @@ -1,11 +1,11 @@ package io.quarkus.smallrye.faulttolerance.runtime; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.faulttolerance.ExecutionContext; import org.eclipse.microprofile.faulttolerance.FallbackHandler; diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFaultToleranceOperationProvider.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFaultToleranceOperationProvider.java index 53614d3f24126..06769240943e4 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFaultToleranceOperationProvider.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/QuarkusFaultToleranceOperationProvider.java @@ -6,9 +6,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/SmallRyeFaultToleranceRecorder.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/SmallRyeFaultToleranceRecorder.java index f1443fb32d4cf..f1481dc59cfde 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/SmallRyeFaultToleranceRecorder.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/SmallRyeFaultToleranceRecorder.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.faulttolerance.exceptions.FaultToleranceDefinitionException; diff --git a/extensions/smallrye-graphql-client/deployment/src/main/java/io/quarkus/smallrye/graphql/client/deployment/SmallRyeGraphQLClientProcessor.java b/extensions/smallrye-graphql-client/deployment/src/main/java/io/quarkus/smallrye/graphql/client/deployment/SmallRyeGraphQLClientProcessor.java index 9323e1eec539d..fdcd856cfbf1a 100644 --- a/extensions/smallrye-graphql-client/deployment/src/main/java/io/quarkus/smallrye/graphql/client/deployment/SmallRyeGraphQLClientProcessor.java +++ b/extensions/smallrye-graphql-client/deployment/src/main/java/io/quarkus/smallrye/graphql/client/deployment/SmallRyeGraphQLClientProcessor.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java index 7d691b1fb2f38..c1553ba681ede 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java index 0c0124cd6f651..2bbc1133d4083 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/DynamicGraphQLClientInjectionWithQuarkusConfigTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/StorkAndGraphQLClientTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/StorkAndGraphQLClientTest.java index 70e0f1e9fb9f0..bde9d888ddaec 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/StorkAndGraphQLClientTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/StorkAndGraphQLClientTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java index e74330e1ab181..d3b1033ce74e4 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientFQNameTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java index 784254cf209eb..c75b3fb652109 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java index 696cb438f38bb..1b066b01ab7ac 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientInjectionWithQuarkusConfigTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java index f4e51f36eda6f..84840596fe0a9 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/TypesafeGraphQLClientShortcutTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/model/TestingGraphQLApi.java b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/model/TestingGraphQLApi.java index 42abcf84dd638..f6f73aed7485e 100644 --- a/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/model/TestingGraphQLApi.java +++ b/extensions/smallrye-graphql-client/deployment/src/test/java/io/quarkus/smallrye/graphql/client/deployment/model/TestingGraphQLApi.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java index fcb6549f7cecf..c313a4c4da3ad 100644 --- a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java +++ b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java @@ -5,9 +5,9 @@ import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java index d44185c471cf4..c2c5cb8660385 100644 --- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java @@ -201,7 +201,7 @@ void registerNativeImageResources(BuildProducer servic // Add a condition for the optional eventing services reflectiveClassCondition.produce(new ReflectiveClassConditionBuildItem(TracingService.class, "io.opentracing.Tracer")); reflectiveClassCondition - .produce(new ReflectiveClassConditionBuildItem(ValidationService.class, "javax.validation.ValidatorFactory")); + .produce(new ReflectiveClassConditionBuildItem(ValidationService.class, "jakarta.validation.ValidatorFactory")); // Use MicroProfile Config (We use the one from the CDI Module) serviceProvider.produce(ServiceProviderBuildItem.allProvidersFromClassPath(MicroProfileConfig.class.getName())); @@ -400,7 +400,7 @@ private Set getAllAdapterClasses(IndexView index) { adapterClasses.addAll( getAdapterClasses(index, DotName.createSimple("jakarta.json.bind.annotation.JsonbTypeAdapter"))); adapterClasses.addAll( - getAdapterClasses(index, DotName.createSimple("javax.json.bind.annotation.JsonbTypeAdapter"))); + getAdapterClasses(index, DotName.createSimple("jakarta.json.bind.annotation.JsonbTypeAdapter"))); return adapterClasses; } diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java index ba8dd7e1769d2..e88b367bc6029 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.Properties; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; import org.hamcrest.CoreMatchers; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/BeanValidationGraphQLDirectivesTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/BeanValidationGraphQLDirectivesTest.java index faab1536063f1..8975d40f956c0 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/BeanValidationGraphQLDirectivesTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/BeanValidationGraphQLDirectivesTest.java @@ -3,8 +3,8 @@ import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.containsString; -import javax.validation.Valid; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ConcurrentAuthTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ConcurrentAuthTest.java index 9504bfcb83ce5..4f8541a62b5da 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ConcurrentAuthTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/ConcurrentAuthTest.java @@ -15,8 +15,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLBlockingModeTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLBlockingModeTest.java index 8e220c5fe78e1..371193ed16e54 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLBlockingModeTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLBlockingModeTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java index de64008574b3c..e78481eadfc7b 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.graphql.GraphQLApi; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTerminateContextTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTerminateContextTest.java index ce6c0123bbdf7..8100c1a227bd6 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTerminateContextTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTerminateContextTest.java @@ -2,7 +2,7 @@ import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLThreadTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLThreadTest.java index 78eedf99c93b3..9787cc2807135 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLThreadTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLThreadTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLValidationMessagesLocalizationTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLValidationMessagesLocalizationTest.java index ef8cd46b9aede..251dc90bd04f1 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLValidationMessagesLocalizationTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLValidationMessagesLocalizationTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.CoreMatchers.containsString; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java index 53c68790e57da..92e2aedb9ae5d 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java index c6576e72f927f..f5a3914d207d8 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java index d41bde3ffd681..04d1187d7ff5d 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java index 133bd22950568..812ccdfc71708 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestContextTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import javax.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.ContextNotActiveException; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestLeakDetectionTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestLeakDetectionTest.java index a05c20265ce85..9d11a93e7940c 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestLeakDetectionTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/RequestLeakDetectionTest.java @@ -9,9 +9,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Query; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java index 3bd90e04ed528..ed33eee1bd533 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Name; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java index a4ccf0d11ae7b..4a4f329f4b92b 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java @@ -9,8 +9,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.graphql.GraphQLApi; diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java index 5a69b62a791d3..be4dd0dbb1fcd 100644 --- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java +++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.graphql.deployment; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Mutation; diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java index c8692d035680e..14933e47d9daf 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonReaderFactory; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonReaderFactory; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableContext; diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java index 127e1ed8cc759..958c0832c4912 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java @@ -8,10 +8,10 @@ import java.util.List; import java.util.regex.Pattern; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReader; import org.jboss.logging.Logger; diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLLocaleResolver.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLLocaleResolver.java index 0bba02a64c008..f4a1f658dc0dc 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLLocaleResolver.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLLocaleResolver.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.hibernate.validator.spi.messageinterpolation.LocaleResolver; import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext; diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java index d9af98e75d81b..7312057315f62 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.graphql.runtime; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import graphql.schema.GraphQLSchema; import io.smallrye.graphql.execution.SchemaPrinter; diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java index 76c5effc51549..3ae05debeed90 100644 --- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java +++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java @@ -85,7 +85,7 @@ class SmallRyeHealthProcessor { private static final DotName HEALTH_GROUP = DotName.createSimple(HealthGroup.class.getName()); private static final DotName HEALTH_GROUPS = DotName.createSimple(HealthGroups.class.getName()); private static final DotName WELLNESS = DotName.createSimple(Wellness.class.getName()); - private static final DotName JAX_RS_PATH = DotName.createSimple("javax.ws.rs.Path"); + private static final DotName JAX_RS_PATH = DotName.createSimple("jakarta.ws.rs.Path"); // For the UI private static final GACT HEALTH_UI_WEBJAR_ARTIFACT_KEY = new GACT("io.smallrye", "smallrye-health-ui", null, "jar"); diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java index 1a87c4b42980e..5030989f53c5e 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/AsyncDispatchedThreadTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.stringContainsInOrder; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/BasicHealthCheck.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/BasicHealthCheck.java index 509887bac68cd..6d6e53dc8011f 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/BasicHealthCheck.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/BasicHealthCheck.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java index 31b15e6fffd8d..b36e48a87b1f7 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.stringContainsInOrder; -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/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java index 1c4633f495b77..54239eb3f9862 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ExpectedBeansUnitTest.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.health.test; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.Liveness; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingHealthCheck.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingHealthCheck.java index 3347daf5257a7..0c49c56be7b76 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingHealthCheck.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingHealthCheck.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java index 2ce753abfa5ed..4c069818555f9 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java index 5fbd13544333e..0d843d56cb901 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckContextPropagationTest.java @@ -7,10 +7,10 @@ import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java index 34e711e7334a0..7aac837a9b72f 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java @@ -12,8 +12,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; -import javax.inject.Named; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java index 89f6472e94338..dadbfee2acc6c 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java @@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java index 99b84af6cb53e..767f16857a147 100644 --- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java +++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.health.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; diff --git a/extensions/smallrye-health/runtime/pom.xml b/extensions/smallrye-health/runtime/pom.xml index d4965a6a547dc..a176b2235ec7c 100644 --- a/extensions/smallrye-health/runtime/pom.xml +++ b/extensions/smallrye-health/runtime/pom.xml @@ -18,7 +18,6 @@ io.smallrye smallrye-health - org.glassfish jakarta.json diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/QuarkusAsyncHealthCheckFactory.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/QuarkusAsyncHealthCheckFactory.java index 15ed0e93fb7bb..90c64a7d5939f 100644 --- a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/QuarkusAsyncHealthCheckFactory.java +++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/QuarkusAsyncHealthCheckFactory.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.health.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessCheck.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessCheck.java index bb7f555734c72..aa66233f086a1 100644 --- a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessCheck.java +++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessCheck.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.health.runtime; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessListener.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessListener.java index b5696dfebfb2d..3a012853908b0 100644 --- a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessListener.java +++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/ShutdownReadinessListener.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.health.runtime; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import org.eclipse.microprofile.health.Readiness; diff --git a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java index 7076b433bddc8..430ebfe2d9008 100644 --- a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java +++ b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java @@ -165,10 +165,10 @@ void registerOptionalClaimProducer(BeanRegistrationPhaseBuildItem beanRegistrati } AnnotationInstance claimQualifier = injectionPoint.getRequiredQualifier(CLAIM_NAME); if (claimQualifier != null && injectionPoint.getType().name().equals(DotNames.PROVIDER)) { - // Classes from javax.json are handled specially + // Classes from jakarta.json are handled specially Type actualType = injectionPoint.getRequiredType(); if (actualType.name().equals(DotNames.OPTIONAL) && !actualType.name().toString() - .startsWith("javax.json")) { + .startsWith("jakarta.json")) { additionalTypes.add(actualType); } } diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/AuthenticatedEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/AuthenticatedEndpoint.java index 163d6f9b844fb..a4ef87e660304 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/AuthenticatedEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/AuthenticatedEndpoint.java @@ -1,7 +1,7 @@ package io.quarkus.jwt.test; -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; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/CustomSecurityIdentityAugmentor.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/CustomSecurityIdentityAugmentor.java index 402b9d4776db1..c870795dead0a 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/CustomSecurityIdentityAugmentor.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/CustomSecurityIdentityAugmentor.java @@ -1,6 +1,6 @@ package io.quarkus.jwt.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.security.identity.AuthenticationRequestContext; import io.quarkus.security.identity.SecurityIdentity; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsEndpoint.java index cc55142bc3837..904b4a012873e 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsEndpoint.java @@ -1,13 +1,13 @@ package io.quarkus.jwt.test; -import javax.annotation.security.DenyAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -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.HttpHeaders; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +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.HttpHeaders; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultScopedEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultScopedEndpoint.java index 17191f8511ad0..66fb6f68cdeb3 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultScopedEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultScopedEndpoint.java @@ -2,18 +2,18 @@ import java.util.Optional; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonString; -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.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +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.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DisabledProactiveAuthFailedExceptionMappingTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DisabledProactiveAuthFailedExceptionMappingTest.java index 8b3be61214626..006911f981bc8 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DisabledProactiveAuthFailedExceptionMappingTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DisabledProactiveAuthFailedExceptionMappingTest.java @@ -1,6 +1,6 @@ package io.quarkus.jwt.test; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/EnabledProactiveAuthFailedExceptionMapperTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/EnabledProactiveAuthFailedExceptionMapperTest.java index ebd85a97539b8..558033bfb2ff7 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/EnabledProactiveAuthFailedExceptionMapperTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/EnabledProactiveAuthFailedExceptionMapperTest.java @@ -1,6 +1,6 @@ package io.quarkus.jwt.test; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; @@ -44,4 +44,4 @@ public Response unauthorized() { } } -} \ No newline at end of file +} diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/GreetingService.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/GreetingService.java index 447e426596c9f..c6b2d1db6acd6 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/GreetingService.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.jwt.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JsonValuejectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JsonValuejectionEndpoint.java index ba350662f0044..d949305da3687 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JsonValuejectionEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JsonValuejectionEndpoint.java @@ -4,19 +4,19 @@ import java.util.HashSet; import java.util.List; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonString; -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.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +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.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java index 89e324cd49549..f1eb08b534727 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java @@ -6,9 +6,9 @@ import java.net.HttpURLConnection; import java.util.HashMap; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; import org.junit.jupiter.api.Assertions; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java index 0d928a3c0aa7b..eba26fc97ae46 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCallerPrincipalUnitTest.java @@ -5,10 +5,10 @@ import java.util.HashSet; import java.util.Set; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; import org.eclipse.microprofile.jwt.Claims; import org.jose4j.jwt.JwtClaims; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtParserEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtParserEndpoint.java index 5ef00b45664ee..60490f22080a5 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtParserEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtParserEndpoint.java @@ -2,11 +2,11 @@ import java.security.PublicKey; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import io.smallrye.jwt.auth.principal.JWTParser; import io.smallrye.jwt.util.KeyUtils; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PermitAllEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PermitAllEndpoint.java index 682475a7799c9..c494bfde34ae7 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PermitAllEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PermitAllEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.jwt.test; -import javax.annotation.security.PermitAll; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.PermitAll; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/permit-all-endpoint") @PermitAll diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionEndpoint.java index f4dcf7bcd2ce1..546ce9529126f 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionEndpoint.java @@ -3,16 +3,16 @@ import java.util.List; import java.util.Set; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -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.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +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.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java index a7fde74b16f75..7ee74de33fb97 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java @@ -4,9 +4,9 @@ import java.net.HttpURLConnection; import java.util.HashMap; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; import org.junit.jupiter.api.Assertions; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java index 663d22249f62c..245ccce8b89a7 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java @@ -3,19 +3,19 @@ import java.security.Principal; import java.util.Optional; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonString; -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.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +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.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java index cb41e3f1b7d06..79c6ab670cb1f 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java @@ -4,9 +4,9 @@ import java.net.HttpURLConnection; import java.util.HashMap; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; import org.junit.jupiter.api.Assertions; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PublicKeyLocationConfigTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PublicKeyLocationConfigTest.java index 6b0eb8bc45234..5bd0033a73a9f 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PublicKeyLocationConfigTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PublicKeyLocationConfigTest.java @@ -4,7 +4,7 @@ import java.util.logging.Level; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequestScopedEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequestScopedEndpoint.java index 2ce150955f40c..982f17728afd4 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequestScopedEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequestScopedEndpoint.java @@ -2,19 +2,19 @@ import java.util.Optional; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonString; -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.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +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.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.Claims; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsEndpoint.java index c8b329b10b9dd..9a5598e92b97b 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsEndpoint.java @@ -3,16 +3,16 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -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.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +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.jwt.Claims; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java index 9b9b90e0956bf..68f6619fb7b0d 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java @@ -4,9 +4,9 @@ import java.net.HttpURLConnection; import java.util.HashMap; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.eclipse.microprofile.jwt.Claims; import org.junit.jupiter.api.Assertions; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesEndpoint.java index 4d120b817b983..2ba268b467616 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesEndpoint.java @@ -3,20 +3,20 @@ import java.security.Principal; import java.util.Date; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.RequestScoped; -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.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.RequestScoped; +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.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.ClaimValue; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java index a64485e0e278f..e7e38d5eb2ba9 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java @@ -3,9 +3,9 @@ import java.io.StringReader; import java.net.HttpURLConnection; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java index 15a8d13e580ef..9e7aafd1776d5 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java @@ -3,7 +3,7 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jose4j.jwt.JwtClaims; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java index 92293c7ae94f6..024b5f3bd50ae 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java @@ -6,8 +6,8 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpResponseStatus; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java index d493f982e4047..36401bb2fea8b 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.jwt.runtime.auth; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.jboss.logging.Logger; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JwtPrincipalProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JwtPrincipalProducer.java index 60c21e2dbf5f8..64bbf9f27139e 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JwtPrincipalProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JwtPrincipalProducer.java @@ -1,10 +1,10 @@ package io.quarkus.smallrye.jwt.runtime.auth; -import javax.annotation.Priority; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.JsonWebToken; @@ -35,4 +35,4 @@ JsonWebToken currentJWTPrincipalOrNull() { } throw new IllegalStateException("Current principal " + identity.getPrincipal() + " is not a JSON web token"); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java index 49510a031d9d0..4c4064680db9e 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java @@ -2,8 +2,8 @@ import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.JsonWebToken; import org.jboss.logging.Logger; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/RawOptionalClaimCreator.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/RawOptionalClaimCreator.java index c9d9f9c3b9ad4..f9f174a283900 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/RawOptionalClaimCreator.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/RawOptionalClaimCreator.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.InjectionPoint; import io.quarkus.arc.Arc; import io.quarkus.arc.BeanCreator; diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java index b99b48bdba15b..7608c1813a7a1 100644 --- a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java +++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.function.BooleanSupplier; -import javax.servlet.DispatcherType; +import jakarta.servlet.DispatcherType; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsDotNames.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsDotNames.java index 2dabc1da997ca..cac8c69d859d0 100644 --- a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsDotNames.java +++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsDotNames.java @@ -64,9 +64,9 @@ public static boolean isMetricAnnotation(AnnotationInstance instance) { } // these are needed for determining whether a class is a REST endpoint or JAX-RS provider - public static final DotName JAXRS_PATH = DotName.createSimple("javax.ws.rs.Path"); + public static final DotName JAXRS_PATH = DotName.createSimple("jakarta.ws.rs.Path"); public static final DotName REST_CONTROLLER = DotName .createSimple("org.springframework.web.bind.annotation.RestController"); - public static final DotName JAXRS_PROVIDER = DotName.createSimple("javax.ws.rs.ext.Provider"); + public static final DotName JAXRS_PROVIDER = DotName.createSimple("jakarta.ws.rs.ext.Provider"); } diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java index d6e815b62060e..a1d836621b22f 100644 --- a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java +++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.function.Predicate; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricType; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java b/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java index 36546ecdd6736..4eaea68fd8352 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java @@ -1,7 +1,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java index ff35b785ec8cb..1f46a23b849fd 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricRegistryTest.java @@ -3,11 +3,11 @@ import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.equalTo; -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 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 org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java index 03415f56c1567..1676a334fb154 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java @@ -7,11 +7,11 @@ import java.io.File; -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 jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java index 956d81794d7a1..c7ff7722a78c8 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; -import javax.ws.rs.core.PathSegment; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.PathSegment; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricRegistry; @@ -51,7 +51,9 @@ public void testMethodReturningServerError() throws InterruptedException { when() .get("/error") .then() - .statusCode(500); + .statusCode(501); + // we only consider requests ending with a 500 as "unsuccessful", + // so a 501 should count towards successful SimpleTimer metric = metricRegistry.simpleTimer("REST.request", new Tag("class", METRIC_RESOURCE_CLASS_NAME), new Tag("method", "error")); @@ -71,7 +73,7 @@ public void testMethodThrowingException() { assertEquals(0, metric.getCount()); assertEquals(0, metric.getElapsedTime().toNanos()); - // calls throwing an unmapped exception should only be reflected in the REST.request.unmappedException.total metric + // calls ending with status code 500 should only be reflected in the REST.request.unmappedException.total metric Counter exceptionCounter = metricRegistry.counter("REST.request.unmappedException.total", new Tag("class", METRIC_RESOURCE_CLASS_NAME), new Tag("method", "exception")); diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/MetricsResource.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/MetricsResource.java index 0b7d47306c2ad..04122ffcdba25 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/MetricsResource.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/MetricsResource.java @@ -4,11 +4,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.PathSegment; -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.core.PathSegment; +import jakarta.ws.rs.core.Response; @Path("/") public class MetricsResource { @@ -22,7 +22,7 @@ public String hello(@PathParam("name") String name) { @Path("/error") @GET public Response error() { - return Response.serverError().build(); + return Response.status(501).build(); } @Path("/exception") diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java index cfd77b83cdf6f..35b1165a16d48 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/registration/DefaultMethodTest.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.metrics.registration; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java index eb3fceff5433b..8e03e84e3447a 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/StereotypeCountedClassTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/stereotypes/CountMe.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/stereotypes/CountMe.java index 57deac8bb3c33..b22aa61e33301 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/stereotypes/CountMe.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/stereotype/stereotypes/CountMe.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Stereotype; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricResource.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricResource.java index 575ebfcaa1eac..3ccbe619bdce4 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricResource.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricResource.java @@ -1,9 +1,9 @@ package io.quarkus.smallrye.metrics.test; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java index 2349682de3fac..d710b04e96ec0 100644 --- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java +++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java @@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Gauge; diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java index a61d6e6abf785..84968332ca457 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java @@ -21,13 +21,14 @@ import java.lang.reflect.Method; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; import io.vertx.ext.web.RoutingContext; @@ -63,9 +64,11 @@ public void filter(final ContainerRequestContext requestContext) { @Override public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) { - // mark the request as successful if it finished without exception or with a mapped exception - // if it ended with an unmapped exception, this filter is not called by RESTEasy - requestContext.setProperty("smallrye.metrics.jaxrs.successful", true); + Response.StatusType statusInfo = responseContext.getStatusInfo(); + // consider all requests ending with 500 as unsuccessful, and anything else as successful + if (statusInfo != null && statusInfo.getStatusCode() != 500) { + requestContext.setProperty("smallrye.metrics.jaxrs.successful", true); + } } } diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java index 2be8383079f28..dee84c3521a3a 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java @@ -4,7 +4,8 @@ import java.lang.reflect.Method; -import javax.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ResourceInfo; import org.jboss.resteasy.reactive.server.ServerResponseFilter; @@ -16,7 +17,7 @@ public class QuarkusRestMetricsFilter { @ServerResponseFilter - public void filter(ResourceInfo resourceInfo, Throwable throwable) { + public void filter(ResourceInfo resourceInfo, ContainerResponseContext responseContext) { Class resourceClass = resourceInfo.getResourceClass(); Method resourceMethod = resourceInfo.getResourceMethod(); if ((resourceClass == null) || (resourceMethod == null)) { @@ -26,9 +27,7 @@ public void filter(ResourceInfo resourceInfo, Throwable throwable) { FilterUtil.finishRequest(System.nanoTime(), resourceInfo.getResourceClass(), resourceInfo.getResourceMethod().getName(), resourceInfo.getResourceMethod().getParameterTypes(), - // FIXME: we need to know whether the exception is mapped or not, how to find out? - // for now let's assume all are unmapped, and therefore if there was an exception, - // increment the failure counter rather than the successful calls counter - () -> throwable == null); + // consider all requests ending with 500 as unsuccessful, and anything else as successful + () -> responseContext.getStatus() != 500); } } diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java index 78c80fcfcbc14..31dd16ce15862 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java index 840be46047a59..b9ebfba6933a3 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.eclipse.microprofile.metrics.ConcurrentGauge; import org.eclipse.microprofile.metrics.Counter; diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java index e15ea64f5b100..260ba3e5a539e 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java @@ -16,7 +16,7 @@ public class RESTEasyExtension implements AnnotationScannerExtension { - private static final DotName DOTNAME_PROVIDER = DotName.createSimple("javax.ws.rs.ext.Provider"); + private static final DotName DOTNAME_PROVIDER = DotName.createSimple("jakarta.ws.rs.ext.Provider"); private static final DotName DOTNAME_ASYNC_RESPONSE_PROVIDER = DotName .createSimple("org.jboss.resteasy.spi.AsyncResponseProvider"); @@ -35,7 +35,7 @@ private void scanAsyncResponseProvidersFromServices() { Thread.currentThread().getContextClassLoader()); // can't use the ServiceLoader API because Providers is not an interface for (String provider : ServiceUtil.classNamesNamedIn(getClass().getClassLoader(), - "META-INF/services/javax.ws.rs.ext.Providers")) { + "META-INF/services/jakarta.ws.rs.ext.Providers")) { scanAsyncResponseProvidersFromClassName(asyncResponseProvider, provider); } } catch (IOException e) { diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MyResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MyResource.java index 7839a33a30449..2a956ed2170a5 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MyResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MyResource.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.openapi.test.hotreload; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/api") public class MyResource { diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MySecondResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MySecondResource.java index eb2d6b4204928..10b8036ed7615 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MySecondResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/MySecondResource.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.openapi.test.hotreload; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/my-second-api") public class MySecondResource { diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AbstractAutoTagResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AbstractAutoTagResource.java index b778172e8653a..5b9e881dceebc 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AbstractAutoTagResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AbstractAutoTagResource.java @@ -1,14 +1,14 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -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; @Produces(MediaType.TEXT_PLAIN) public interface AbstractAutoTagResource { @GET @Path("/{id}") T getById(@PathParam("id") long id); -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagFetchableResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagFetchableResource.java index bdacd06926616..99db3f2bef4ff 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagFetchableResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagFetchableResource.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.GET; +import jakarta.ws.rs.GET; public abstract class AutoTagFetchableResource implements AbstractAutoTagResource { diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagResource.java index 0412d7d6b93c0..940230dc11055 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/AutoTagResource.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/tagged") public class AutoTagResource extends AutoTagFetchableResource { diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java index e6d751cdf85c3..0715898c0ecc2 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java @@ -1,10 +1,10 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -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.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/greeting") public class DefaultContentTypeResource { @@ -28,4 +28,4 @@ public Greeting byebye() { return new Greeting("Good Bye !"); } -} \ No newline at end of file +} diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java index 227e15567a630..0e0fddb27315f 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java @@ -2,7 +2,7 @@ import java.util.Optional; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java index de854165f7505..d4a999bdc7960 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java @@ -1,9 +1,9 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtClassLevel.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtClassLevel.java index 164ea97c27954..ea92555faee74 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtClassLevel.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtClassLevel.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement; import org.eclipse.microprofile.openapi.annotations.servers.Server; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel.java index 6a3dc43cadfab..4e71c1dc36051 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement; import org.eclipse.microprofile.openapi.annotations.servers.Server; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel2.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel2.java index 98bef92c50ebf..b920b06f95e0a 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel2.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceAuthenticatedAtMethodLevel2.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement; import org.eclipse.microprofile.openapi.annotations.servers.Server; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtClassLevel.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtClassLevel.java index 2d6749566c6e1..25fd247141bcf 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtClassLevel.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtClassLevel.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -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; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel.java index ff3e17182fa0e..41c0704f40867 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -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; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel2.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel2.java index 92c5610dae071..139823d65b032 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel2.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceSecuredAtMethodLevel2.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -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; import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement; import org.eclipse.microprofile.openapi.annotations.servers.Server; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceWithNoTag.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceWithNoTag.java index c93cc0dc2f3c8..a27ef2eeb43f9 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceWithNoTag.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResourceWithNoTag.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java index 70bf3ccd23aa1..cd81c5ffc34d6 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ResourceBean { diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean2.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean2.java index 134a04b5657c1..30f95908d171b 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean2.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean2.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.openapi.test.jaxrs; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.security.Authenticated; diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiRoute.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiRoute.java index 3acb0d2ada95d..cd03c2b2ccf34 100644 --- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiRoute.java +++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiRoute.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.openapi.test.vertx; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Param; import io.quarkus.vertx.web.Route; diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java index 7b107646d0c33..c71c452a9143b 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java @@ -4,8 +4,8 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.openapi.OASFilter; diff --git a/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java b/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java index 619e50c542fb9..23687250ed9e1 100644 --- a/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java +++ b/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.servlet.DispatcherType; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.servlet.DispatcherType; import io.opentracing.Tracer; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; diff --git a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Fruit.java b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Fruit.java index 9af9e2b3b1f87..dfe69588a107f 100644 --- a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Fruit.java +++ b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Fruit.java @@ -1,15 +1,15 @@ package io.quarkus.smallrye.opentracing.deployment; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/RestService.java b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/RestService.java index 67ba3ae5a3951..0589f77db2830 100644 --- a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/RestService.java +++ b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/RestService.java @@ -3,11 +3,11 @@ import java.util.List; 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 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("/") public interface RestService { diff --git a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Service.java b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Service.java index 2547e672cc275..5cf5fe0d47a54 100644 --- a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Service.java +++ b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/Service.java @@ -5,9 +5,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TestResource.java b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TestResource.java index 904fa837545ac..1edb36a5409c0 100644 --- a/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TestResource.java +++ b/extensions/smallrye-opentracing/deployment/src/test/java/io/quarkus/smallrye/opentracing/deployment/TestResource.java @@ -3,11 +3,11 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.rest.client.RestClientBuilder; diff --git a/extensions/smallrye-opentracing/runtime/pom.xml b/extensions/smallrye-opentracing/runtime/pom.xml index f3356d8993c5b..8d8916cef1a72 100644 --- a/extensions/smallrye-opentracing/runtime/pom.xml +++ b/extensions/smallrye-opentracing/runtime/pom.xml @@ -37,8 +37,8 @@ See https://github.com/opentracing-contrib/java-interceptors/issues/15 --> - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api io.smallrye diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingDynamicFeature.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingDynamicFeature.java index bc25e52d34742..bc115097f088b 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingDynamicFeature.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingDynamicFeature.java @@ -1,11 +1,11 @@ package io.quarkus.smallrye.opentracing.runtime; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; import io.opentracing.Tracer; import io.smallrye.opentracing.contrib.jaxrs2.server.OperationNameProvider; diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java index 72d2893e1a744..ba2320371a1ad 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.interceptor.Interceptor; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.Interceptor; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java index 5cfb72e74517d..681b78b369eed 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; import io.opentracing.tag.Tags; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracerProducer.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracerProducer.java index 4688038b76f22..4af785fbacfb7 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracerProducer.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracerProducer.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.opentracing.runtime; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import io.opentracing.Tracer; import io.opentracing.util.GlobalTracer; diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracingConfigRelocateConfigSourceInterceptor.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracingConfigRelocateConfigSourceInterceptor.java index 5b51c2edfe171..9f1a0fe73a226 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracingConfigRelocateConfigSourceInterceptor.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/TracingConfigRelocateConfigSourceInterceptor.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import io.smallrye.config.ConfigSourceInterceptorContext; import io.smallrye.config.ConfigValue; diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ConsumingBean.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ConsumingBean.java index 1b00e59433c0b..67872c2d61a95 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ConsumingBean.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ConsumingBean.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.amqp; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ProducingBean.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ProducingBean.java index e56e3444b33a6..d708936335aa2 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ProducingBean.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/ProducingBean.java @@ -1,11 +1,11 @@ package io.quarkus.smallrye.reactivemessaging.amqp; import java.time.Duration; +import java.util.concurrent.Flow; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.reactivestreams.Publisher; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; @@ -14,7 +14,7 @@ public class ProducingBean { @Outgoing("source") - public Publisher generate() { + public Flow.Publisher generate() { return Multi.createFrom().range(1, 11) .map(Integer::longValue) .map(i -> i * 2) diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/TestResource.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/TestResource.java index f5a201943b66b..cb24dbc52ddfb 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/TestResource.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/TestResource.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.reactivemessaging.amqp; -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("/last") public class TestResource { diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Consumer.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Consumer.java index b2d034efbd3d1..1bc4a57690f29 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Consumer.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Consumer.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.amqp.devmode.nohttp; -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/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Producer.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Producer.java index a0f4182d6880e..812ed0ac96845 100644 --- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Producer.java +++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/amqp/devmode/nohttp/Producer.java @@ -1,18 +1,18 @@ package io.quarkus.smallrye.reactivemessaging.amqp.devmode.nohttp; import java.time.Duration; +import java.util.concurrent.Flow; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.reactivestreams.Publisher; import io.smallrye.mutiny.Multi; @ApplicationScoped public class Producer { @Outgoing("source") - public Publisher generate() { + public Flow.Publisher generate() { return Multi.createFrom().ticks().every(Duration.ofMillis(200)) .onOverflow().drop() .map(i -> i * 1); diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java index 8950e35fc578d..3928ce5e03068 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeDiscoveryState.java @@ -170,7 +170,7 @@ boolean hasApicurio2() { boolean hasJsonb() { if (hasJsonb == null) { try { - Class.forName("javax.json.bind.Jsonb", false, + Class.forName("jakarta.json.bind.Jsonb", false, Thread.currentThread().getContextClassLoader()); hasJsonb = true; } catch (ClassNotFoundException e) { diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java index ce568884642af..c14c53b28167d 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/DefaultSerdeConfigTest.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.avro.generic.GenericRecord; import org.apache.avro.specific.AvroGenerated; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/VertxSerdeRemovedTest.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/VertxSerdeRemovedTest.java index 2b04458ad040f..c496aeb09f0bb 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/VertxSerdeRemovedTest.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/VertxSerdeRemovedTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/KafkaDevServicesDevModeTestCase.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/KafkaDevServicesDevModeTestCase.java index 869d81a53c702..34ea6085e013b 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/KafkaDevServicesDevModeTestCase.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/KafkaDevServicesDevModeTestCase.java @@ -5,10 +5,10 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Supplier; -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.assertj.core.api.Assertions; import org.awaitility.Awaitility; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceConverter.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceConverter.java index b49922cc2a616..c73ec00daad4e 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceConverter.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceConverter.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.kafka.deployment.dev; -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/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceGenerator.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceGenerator.java index 9471f16eca404..cab08dfc64d4a 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceGenerator.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/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/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceResource.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceResource.java index 6a434b84b527a..de6a94c1b624c 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceResource.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/dev/PriceResource.java @@ -1,9 +1,9 @@ package io.quarkus.smallrye.reactivemessaging.kafka.deployment.dev; -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.reactive.messaging.Channel; import org.reactivestreams.Publisher; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceConverter.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceConverter.java index af2a5663ad7fd..0a112eb128e9b 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceConverter.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceConverter.java @@ -5,7 +5,7 @@ //import org.eclipse.microprofile.reactive.messaging.Incoming; //import org.eclipse.microprofile.reactive.messaging.Outgoing; // -//import javax.enterprise.context.ApplicationScoped; +//import jakarta.enterprise.context.ApplicationScoped; // //@ApplicationScoped public class PriceConverter { @@ -17,4 +17,4 @@ public class PriceConverter { // public double process(int priceInUsd) { // return priceInUsd * CONVERSION_RATE; // } -} \ No newline at end of file +} diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceGenerator.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceGenerator.java index 71a8dedc772ad..c367a10b6b1b6 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceGenerator.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceGenerator.java @@ -3,7 +3,7 @@ //import io.smallrye.mutiny.Multi; //import org.eclipse.microprofile.reactive.messaging.Outgoing; // -//import javax.enterprise.context.ApplicationScoped; +//import jakarta.enterprise.context.ApplicationScoped; //import java.time.Duration; //import java.util.Random; // @@ -17,4 +17,4 @@ public class PriceGenerator { // .onOverflow().drop() // .map(tick -> this.random.nextInt(100)); // } -} \ No newline at end of file +} diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResource.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResource.java index 4cc607f296c7d..9c6f7dc20880d 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResource.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResource.java @@ -4,10 +4,10 @@ //import org.eclipse.microprofile.reactive.messaging.Channel; //import org.reactivestreams.Publisher; // -//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("/prices") public class PriceResource { @@ -23,4 +23,4 @@ public class PriceResource { // public Publisher ssePrices() { // return this.processedPrices; // } -} \ No newline at end of file +} diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResourceET.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResourceET.java index e19a2b0753890..26e2f80a480a8 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResourceET.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/PriceResourceET.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.assertj.core.api.Assertions; import org.awaitility.Awaitility; diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntity.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntity.java index 931e4b224a0e3..7d455b0bc917f 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntity.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntity.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.reactivemessaging.kafka; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.MappedSuperclass; import org.apache.kafka.common.TopicPartition; diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntityId.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntityId.java index eeeab7a60c884..da2b4518398ba 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntityId.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/CheckpointEntityId.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import org.apache.kafka.common.TopicPartition; diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/DatabindProcessingStateCodec.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/DatabindProcessingStateCodec.java index 8078dca06c9dd..c19030d0dbdd4 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/DatabindProcessingStateCodec.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/DatabindProcessingStateCodec.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateOrmStateStore.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateOrmStateStore.java index 9a8f75a79a7f3..c7a78c6673efe 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateOrmStateStore.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateOrmStateStore.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateReactiveStateStore.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateReactiveStateStore.java index 811b29bb10115..4635d21946aba 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateReactiveStateStore.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/HibernateReactiveStateStore.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/RedisStateStore.java b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/RedisStateStore.java index b606a2e14a67b..a562c7950a680 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/RedisStateStore.java +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/RedisStateStore.java @@ -7,11 +7,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.common.TopicPartition; diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java index f728ca500e097..b0b54ffa49700 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/SmallRyeReactiveMessagingRabbitMQProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.rabbitmq.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.rabbitmq.client.impl.CredentialsProvider; diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devconsole/RabbitHttpPortFinder.java b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devconsole/RabbitHttpPortFinder.java index 117b7e907ee7b..e222ac14df4b2 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devconsole/RabbitHttpPortFinder.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devconsole/RabbitHttpPortFinder.java @@ -1,7 +1,7 @@ package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.Config; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java index 59b0c766fae65..858b60cfd4195 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java @@ -114,11 +114,8 @@ public static QuarkusMediatorConfiguration create(MethodInfo methodInfo, boolean configuration.setProduction(validationOutput.getProduction()); configuration.setConsumption(validationOutput.getConsumption()); configuration.setIngestedPayloadType(validationOutput.getIngestedPayloadType()); - if (validationOutput.getUseBuilderTypes()) { - configuration.setUseBuilderTypes(validationOutput.getUseBuilderTypes()); - } else { - configuration.setUseBuilderTypes(false); - } + configuration.setUseBuilderTypes(validationOutput.getUseBuilderTypes()); + configuration.setUseReactiveStreams(validationOutput.getUseReactiveStreams()); if (acknowledgment == null) { acknowledgment = mediatorConfigurationSupport.processDefaultAcknowledgement(shape, diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java index 19dc9c4b664eb..b9db175cfb784 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java @@ -55,9 +55,8 @@ public final class ReactiveMessagingDotNames { static final DotName EMITTER_FACTORY_FOR = DotName.createSimple(EmitterFactoryFor.class.getName()); static final DotName INCOMING_CONNECTOR_FACTORY = DotName.createSimple(IncomingConnectorFactory.class.getName()); - static final DotName OUTGOING_CONNECTOR_FACTORY = DotName.createSimple(OutgoingConnectorFactory.class.getName()); - static final DotName INBOUND_CONNECTOR = DotName.createSimple(InboundConnector.class.getName()); + static final DotName OUTGOING_CONNECTOR_FACTORY = DotName.createSimple(OutgoingConnectorFactory.class.getName()); static final DotName OUTBOUND_CONNECTOR = DotName.createSimple(OutboundConnector.class.getName()); static final DotName SMALLRYE_BLOCKING = DotName.createSimple(io.smallrye.common.annotation.Blocking.class.getName()); @@ -69,17 +68,17 @@ public final class ReactiveMessagingDotNames { .createSimple("io.smallrye.reactive.messaging.providers.metrics.MicrometerDecorator"); // Used to detect REST endpoints and JAX-RS provider - public static final DotName JAXRS_PATH = DotName.createSimple("javax.ws.rs.Path"); + public static final DotName JAXRS_PATH = DotName.createSimple("jakarta.ws.rs.Path"); public static final DotName REST_CONTROLLER = DotName .createSimple("org.springframework.web.bind.annotation.RestController"); - public static final DotName JAXRS_PROVIDER = DotName.createSimple("javax.ws.rs.ext.Provider"); + public static final DotName JAXRS_PROVIDER = DotName.createSimple("jakarta.ws.rs.ext.Provider"); static final DotName CONTINUATION = DotName.createSimple("kotlin.coroutines.Continuation"); static final DotName KOTLIN_UNIT = DotName.createSimple("kotlin.Unit"); static final DotName ABSTRACT_SUBSCRIBING_COROUTINE_INVOKER = DotName .createSimple("io.quarkus.smallrye.reactivemessaging.runtime.kotlin.AbstractSubscribingCoroutineInvoker"); - static final DotName TRANSACTIONAL = DotName.createSimple("javax.transaction.Transactional"); + static final DotName TRANSACTIONAL = DotName.createSimple("jakarta.transaction.Transactional"); private ReactiveMessagingDotNames() { } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java index c329c7f8f7891..6f7ca0f537337 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java @@ -12,9 +12,9 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.spi.Connector; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/WiringProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/WiringProcessor.java index e04797ec80a72..61a31a4f8f5e2 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/WiringProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/WiringProcessor.java @@ -18,7 +18,7 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.commonmark.parser.Parser; import org.commonmark.renderer.html.HtmlRenderer; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java index e7eaacd4010a5..f0cf70d95c9f6 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChainTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java index a895d1b7172dc..90dc2222671ca 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DefaultScopeTest.java @@ -2,14 +2,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +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.Incoming; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java index 0b323afdf2c4c..452180cffbf7c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.streams.operators.ProcessorBuilder; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java index 469b16e42df7d..aee3574126cf1 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java @@ -5,7 +5,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SimpleBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SimpleBean.java index 451aea7209709..5924708cde2b5 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SimpleBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SimpleBean.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java index 19ed893c12c31..68af7c38ffd81 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java @@ -5,15 +5,15 @@ import java.io.File; import java.util.List; +import java.util.concurrent.Flow; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Publisher; import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingUsingSmallRyeBlocking; import io.quarkus.test.QuarkusUnitTest; @@ -47,7 +47,7 @@ public void testIncomingUsingRunOnWorkerThread() { @ApplicationScoped public static class ProduceIn { @Outgoing("in") - public Publisher produce() { + public Flow.Publisher produce() { return Multi.createFrom().items("a", "b", "c", "d", "e", "f"); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/TransactionalSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/TransactionalSubscriberTest.java index 85db105af0b1c..81e3a7639d388 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/TransactionalSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/TransactionalSubscriberTest.java @@ -5,15 +5,15 @@ import java.io.File; import java.util.List; +import java.util.concurrent.Flow; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Publisher; import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingUsingTransactional; import io.quarkus.test.QuarkusUnitTest; @@ -47,7 +47,7 @@ public void testIncomingUsingRunOnWorkerThread() { @ApplicationScoped public static class ProduceIn { @Outgoing("in") - public Publisher produce() { + public Flow.Publisher produce() { return Multi.createFrom().items("a", "b", "c", "d", "e", "f"); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java index 399947bf48dc4..7c726a611b25c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java index d2949c0ad6afe..9db7283577cea 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java @@ -5,15 +5,15 @@ import java.io.File; import java.util.List; +import java.util.concurrent.Flow; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Publisher; import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingCustomTwoBlockingBean; import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingCustomUnorderedBlockingBean; @@ -72,7 +72,7 @@ public void testIncomingBlockingCustomPoolTwo() { public static class ProduceIn { @Outgoing("in") @Broadcast(2) - public Publisher produce() { + public Flow.Publisher produce() { return Multi.createFrom().items("a", "b", "c", "d", "e", "f"); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java index 97763d064b500..d708869bde5b4 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingValidationErrorTest.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java index 3dad8f8cbc8ec..3765637f91bc4 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingWithoutOutgoingOnIncomingErrorTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java index 9808c63eba0b1..9cfcf4a199c7c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java index 54bddca3ae6ae..dddaaf8838292 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java @@ -5,15 +5,15 @@ import java.io.File; import java.util.List; +import java.util.concurrent.Flow; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Publisher; import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingUsingSmallRyeBlocking; import io.quarkus.test.QuarkusUnitTest; @@ -47,7 +47,7 @@ public void testIncomingUsingRunOnWorkerThread() { @ApplicationScoped public static class ProduceIn { @Outgoing("in") - public Publisher produce() { + public Flow.Publisher produce() { return Multi.createFrom().items("a", "b", "c", "d", "e", "f"); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java index 661d5e351d641..dfb8612a1c703 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java @@ -4,7 +4,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java index 70bdcd1ea2e6d..2ab9c7aba3b84 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java @@ -4,7 +4,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java index 56ff7c1665297..359c0246dafc8 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java @@ -4,7 +4,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java index e24b3265b556a..8fe5857532c6a 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java @@ -4,7 +4,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomTwoBlockingBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomTwoBlockingBean.java index 23cd7a91ccfd2..c976830d55566 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomTwoBlockingBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomTwoBlockingBean.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomUnorderedBlockingBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomUnorderedBlockingBean.java index fccd7cb225aa7..5ae0b188b8e3a 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomUnorderedBlockingBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingCustomUnorderedBlockingBean.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java index 9ca31331ea73f..6f6811b9220ef 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingTransactional.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingTransactional.java index af17e380a7ec8..8860d96ce7155 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingTransactional.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingTransactional.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java index 81df71a8a8db0..da09c83fe0213 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java index f381e597bc495..cee21ad4c9902 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java @@ -2,8 +2,8 @@ import java.util.List; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java index 530d4e3a963df..78535791f0a6d 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java index a1ddef78bfd8c..16fa31cd51b03 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java index c0280c56bfbd4..084ddf6a2678c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.messaging.Outgoing; @@ -13,6 +13,7 @@ import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.annotations.Channel; +import mutiny.zero.flow.adapters.AdaptersToFlow; @ApplicationScoped public class DeprecatedChannelConsumer { @@ -22,7 +23,7 @@ public class DeprecatedChannelConsumer { Publisher> sourceStream; public List consume() { - return Multi.createFrom().publisher(sourceStream) + return Multi.createFrom().publisher(AdaptersToFlow.publisher(sourceStream)) .onItem().transform(Message::getPayload) .collect().asList() .await().indefinitely(); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java index c7f3163ca0ab1..f4072208593a8 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java index 30723109a06d9..05ef3615e258e 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java index 196ba75ef1d45..1e995d82faafe 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java index d4fa3f9edc95f..31f9971b341c1 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java index 090e064145dac..cde8be34b1344 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java index d1b393d14d80f..2a3b4b6f0a656 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java index 4ea634bc0beee..4f50c9ce9a5b8 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java index 60dd90f028a53..e09ce0c57dc9d 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java index 24156b8895418..5b99b7a17bfbf 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java index 04a888bbda74c..cb0694f274ec7 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java index ae1f718a0c6a4..9e1c68bbd08dd 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java index 512c6f63bbf42..3c9f90e086ba5 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java index 73799043255bf..0c888eb4ff480 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorConfigTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorDoubleQuoteConfigTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorDoubleQuoteConfigTest.java index 46b6350d0bfed..02719d1195801 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorDoubleQuoteConfigTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorDoubleQuoteConfigTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java index e79fc5e66bd46..c4300ae660b51 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/ConnectorProfileConfigTest.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/DumbConnector.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/DumbConnector.java index 5c365fd7d7fa5..66ee2032d1f3f 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/DumbConnector.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/config/DumbConnector.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.config; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java index e27ba242254f3..08fb32d50f4a4 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java @@ -8,8 +8,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/HttpFrontend.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/HttpFrontend.java index e021eac9057b5..53faabcde3fb1 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/HttpFrontend.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/HttpFrontend.java @@ -1,9 +1,9 @@ package io.quarkus.smallrye.reactivemessaging.devmode; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/MyProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/MyProcessor.java index 257be19e394d8..c184e28b4f363 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/MyProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/devmode/MyProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.devmode; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeConnector.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeConnector.java index a31575383e220..cdf9c45ad39ee 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeConnector.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeConnector.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.reactivemessaging.hotreload; -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.Config; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeProcessor.java index c5e483954b49b..988c4e3c86c24 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.hotreload; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSink.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSink.java index e5cfaf25e432c..3be65e4faf197 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSink.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSink.java @@ -1,8 +1,8 @@ package io.quarkus.smallrye.reactivemessaging.hotreload; -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.reactive.messaging.Incoming; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java index cddf04eddf867..e5fe535880e31 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiIntBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiIntBean.java index 7d3df089478da..29027a2a9a64c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiIntBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiIntBean.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiStringBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiStringBean.java index b758295482d56..937735b358e81 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiStringBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiStringBean.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java index 69f45a61cdbda..bfa32b7ea7d07 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/MultiTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/StringProducer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/StringProducer.java index 3f17dc8745b97..984e09f000129 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/StringProducer.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/StringProducer.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.reactivemessaging.mutiny; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniBean.java index e29d3c0a5fd2e..ac583b74690bc 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniBean.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -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/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java index 49ad142bce891..c2c3eef875c6e 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/mutiny/UniTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java index 238a124f9d0e0..8800f0cc06904 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/IncomingsTest.java @@ -5,15 +5,15 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Flow; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Publisher; import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; @@ -39,7 +39,7 @@ public void testIncomingsWithTwoSources() { public static class ProducerOnA { @Outgoing("a") - public Publisher produce() { + public Flow.Publisher produce() { return Multi.createFrom().items("a", "b", "c"); } @@ -49,7 +49,7 @@ public Publisher produce() { public static class ProducerOnB { @Outgoing("b") - public Publisher produce() { + public Flow.Publisher produce() { return Multi.createFrom().items("d", "e", "f"); } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java index cf1a03c0a9ac4..b65357bf8364c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/ProcessorSignatureTest.java @@ -10,8 +10,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java index 6fa6c8333ba72..20caf2f60a24c 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/PublisherSignatureTest.java @@ -11,8 +11,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java index 568066240bc1c..b78eb4f3a4159 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/SubscriberSignatureTest.java @@ -10,8 +10,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java index 7b42f4eb6fa99..171563a1d14f3 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/signatures/TransformerSignatureTest.java @@ -9,8 +9,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentChannelTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentChannelTest.java index 6a2a0cfb48969..3b9650e229ec0 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentChannelTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentChannelTest.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.Config; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -23,6 +23,7 @@ import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public class ConnectorAttachmentChannelTest { @@ -45,7 +46,8 @@ static class MyDummyConnector implements IncomingConnectorFactory { @Override public PublisherBuilder> getPublisherBuilder(Config config) { - return ReactiveStreams.fromPublisher(Multi.createFrom().range(0, 5).map(Message::of)); + return ReactiveStreams + .fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().range(0, 5).map(Message::of))); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentCustomEmitterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentCustomEmitterTest.java index 652321db30178..e8dfb8b826dc6 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentCustomEmitterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentCustomEmitterTest.java @@ -5,13 +5,14 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Flow; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Channel; @@ -24,7 +25,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.reactivestreams.Publisher; import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; @@ -89,7 +89,7 @@ interface CustomEmitter extends EmitterType { static class CustomEmitterImpl implements MessagePublisherProvider, CustomEmitter { @Override - public Publisher> getPublisher() { + public Flow.Publisher> getPublisher() { return Multi.createFrom().range(0, 5).map(Message::of).map(m -> (Message) m); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentEmitterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentEmitterTest.java index 9c0ded5da5658..bf4d6812424c2 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentEmitterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentEmitterTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentIncomingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentIncomingTest.java index 2cdaa559a2d51..4968931d27d56 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentIncomingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentIncomingTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -22,6 +22,7 @@ import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public class ConnectorAttachmentIncomingTest { @@ -44,7 +45,8 @@ static class MyDummyConnector implements IncomingConnectorFactory { @Override public PublisherBuilder> getPublisherBuilder(Config config) { - return ReactiveStreams.fromPublisher(Multi.createFrom().range(0, 5).map(Message::of)); + return ReactiveStreams + .fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().range(0, 5).map(Message::of))); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentMutinyEmitterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentMutinyEmitterTest.java index debedcdf85fc0..d596b1314eaca 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentMutinyEmitterTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentMutinyEmitterTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentOutgoingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentOutgoingTest.java index ef2718b9edfdf..5effe85eb507d 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentOutgoingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/ConnectorAttachmentOutgoingTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java index b423efe7e91af..dd059d54a748d 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentIncomingTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -23,6 +23,7 @@ import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public class DisabledConnectorAttachmentIncomingTest { @@ -48,7 +49,8 @@ static class MyDummyConnector implements IncomingConnectorFactory { @Override public PublisherBuilder> getPublisherBuilder(Config config) { - return ReactiveStreams.fromPublisher(Multi.createFrom().range(0, 5).map(Message::of)); + return ReactiveStreams + .fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().range(0, 5).map(Message::of))); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java index 11a5684b94a19..0167d67092acd 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/DisabledConnectorAttachmentOutgoingTest.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/IncomingChannelWithDotsTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/IncomingChannelWithDotsTest.java index 33ea46cae0249..9ffb14588289b 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/IncomingChannelWithDotsTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/IncomingChannelWithDotsTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -22,6 +22,7 @@ import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public class IncomingChannelWithDotsTest { @@ -44,7 +45,8 @@ static class MyDummyConnector implements IncomingConnectorFactory { @Override public PublisherBuilder> getPublisherBuilder(Config config) { - return ReactiveStreams.fromPublisher(Multi.createFrom().range(0, 5).map(Message::of)); + return ReactiveStreams + .fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().range(0, 5).map(Message::of))); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingIncomingConnectorDetectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingIncomingConnectorDetectionTest.java index f0212f36f3f52..9d2a130e76915 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingIncomingConnectorDetectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingIncomingConnectorDetectionTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingOutgoingConnectorDetectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingOutgoingConnectorDetectionTest.java index 314f82b455791..c012f67c4e5da 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingOutgoingConnectorDetectionTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/MissingOutgoingConnectorDetectionTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/NoConnectorAttachmentTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/NoConnectorAttachmentTest.java index 99a5759fce87c..d0f9e180c221a 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/NoConnectorAttachmentTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/NoConnectorAttachmentTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/OutgoingWithDotsTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/OutgoingWithDotsTest.java index f57eaca16438b..2d3ce4112c2a5 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/OutgoingWithDotsTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/OutgoingWithDotsTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentIncomingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentIncomingTest.java index f3acf720a2119..5ffe5ef6888cf 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentIncomingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentIncomingTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Incoming; @@ -23,6 +23,7 @@ import io.quarkus.test.QuarkusUnitTest; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; public class TwoConnectorsAttachmentIncomingTest { @@ -47,7 +48,8 @@ static class MyDummyConnector implements IncomingConnectorFactory { @Override public PublisherBuilder> getPublisherBuilder(Config config) { - return ReactiveStreams.fromPublisher(Multi.createFrom().range(0, 5).map(Message::of)); + return ReactiveStreams + .fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().range(0, 5).map(Message::of))); } } @@ -57,7 +59,8 @@ static class MySecondDummyConnector implements IncomingConnectorFactory { @Override public PublisherBuilder> getPublisherBuilder(Config config) { - return ReactiveStreams.fromPublisher(Multi.createFrom().range(0, 5).map(Message::of)); + return ReactiveStreams + .fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().range(0, 5).map(Message::of))); } } diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentOutgoingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentOutgoingTest.java index 06333a344cf37..da04022c5ec4a 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentOutgoingTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/wiring/TwoConnectorsAttachmentOutgoingTest.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/extensions/smallrye-reactive-messaging/kotlin/src/main/kotlin/io/quarkus/smallrye/reactivemessaging/runtime/kotlin/ApplicationCoroutineScope.kt b/extensions/smallrye-reactive-messaging/kotlin/src/main/kotlin/io/quarkus/smallrye/reactivemessaging/runtime/kotlin/ApplicationCoroutineScope.kt index cce302018985b..5cf0dcf8bd4f5 100644 --- a/extensions/smallrye-reactive-messaging/kotlin/src/main/kotlin/io/quarkus/smallrye/reactivemessaging/runtime/kotlin/ApplicationCoroutineScope.kt +++ b/extensions/smallrye-reactive-messaging/kotlin/src/main/kotlin/io/quarkus/smallrye/reactivemessaging/runtime/kotlin/ApplicationCoroutineScope.kt @@ -1,10 +1,10 @@ package io.quarkus.smallrye.reactivemessaging.runtime.kotlin +import jakarta.annotation.PreDestroy +import jakarta.inject.Singleton import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel -import javax.annotation.PreDestroy -import javax.inject.Singleton import kotlin.coroutines.CoroutineContext @Singleton diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactory.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactory.java index 27e6a5d4b9606..dbb9cd28822b1 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactory.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactory.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target(ElementType.TYPE) diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactoryInterceptor.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactoryInterceptor.java index a0659ecad6333..7ac562c0b1f4a 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactoryInterceptor.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/DuplicatedContextConnectorFactoryInterceptor.java @@ -1,15 +1,15 @@ package io.quarkus.smallrye.reactivemessaging.runtime; import java.util.Optional; +import java.util.concurrent.Flow; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; -import org.reactivestreams.Publisher; import io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle; import io.smallrye.common.vertx.VertxContext; @@ -29,7 +29,7 @@ public Object intercept(InvocationContext ctx) throws Exception { return result.map(DuplicatedContextConnectorFactoryInterceptor::setMessageContextSafe); } if (ctx.getMethod().getName().equals("getPublisher")) { - Publisher> result = (Publisher>) ctx.proceed(); + Flow.Publisher> result = (Flow.Publisher>) ctx.proceed(); return Multi.createFrom().publisher(result) .map(DuplicatedContextConnectorFactoryInterceptor::setMessageContextSafe); } diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java index 962e56ccce86e..054e1111d8960 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.Bean; import org.eclipse.microprofile.reactive.messaging.Acknowledgment; @@ -53,6 +53,8 @@ public class QuarkusMediatorConfiguration implements MediatorConfiguration { private Type ingestedPayload; + private boolean useReactiveStreams = false; + public String getBeanId() { return beanId; } @@ -260,4 +262,17 @@ public void setBlockingExecutionOrdered(boolean blockingExecutionOrdered) { public void setWorkerPoolName(String workerPoolName) { this.workerPoolName = workerPoolName; } + + public boolean isUseReactiveStreams() { + return useReactiveStreams; + } + + public void setUseReactiveStreams(boolean usesReactiveStreams) { + this.useReactiveStreams = usesReactiveStreams; + } + + @Override + public boolean usesReactiveStreams() { + return useReactiveStreams; + } } diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusWorkerPoolRegistry.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusWorkerPoolRegistry.java index 79c928c8f9c86..f2fbc4307e620 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusWorkerPoolRegistry.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusWorkerPoolRegistry.java @@ -6,12 +6,12 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.event.Observes; -import javax.enterprise.event.Reception; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.Reception; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.ConfigProvider; import org.slf4j.LoggerFactory; diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java index 8ad0e75d8dc19..89294f8e41b89 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java @@ -1,14 +1,14 @@ package io.quarkus.smallrye.reactivemessaging.runtime; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableContext; diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java index 2113e4feceafd..898d181381cf3 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.eclipse.microprofile.config.Config; diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactory.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactory.java index 223c1bfd918b6..d07037628a958 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactory.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactory.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target(ElementType.TYPE) diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactoryInterceptor.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactoryInterceptor.java index e89e6979e2a7a..ffeaae2e883b6 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactoryInterceptor.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devmode/DevModeSupportConnectorFactoryInterceptor.java @@ -1,18 +1,18 @@ package io.quarkus.smallrye.reactivemessaging.runtime.devmode; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Flow; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.reactive.messaging.Message; import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder; -import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -50,7 +50,7 @@ public Object intercept(InvocationContext ctx) throws Exception { }); } if (ctx.getMethod().getName().equals("getPublisher")) { - Publisher> result = (Publisher>) ctx.proceed(); + Flow.Publisher> result = (Flow.Publisher>) ctx.proceed(); return Multi.createFrom().publisher(result) .onItem().transformToUniAndConcatenate(msg -> Uni.createFrom().emitter(e -> { onMessage.get().whenComplete((restarted, error) -> { @@ -94,12 +94,12 @@ public void onComplete() { }); } if (ctx.getMethod().getName().equals("getSubscriber")) { - Subscriber> result = (Subscriber>) ctx.proceed(); - return new Subscriber>() { - private Subscriber> subscriber; + Flow.Subscriber> result = (Flow.Subscriber>) ctx.proceed(); + return new Flow.Subscriber>() { + private Flow.Subscriber> subscriber; @Override - public void onSubscribe(Subscription s) { + public void onSubscribe(Flow.Subscription s) { subscriber = result; subscriber.onSubscribe(s); } diff --git a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/QuarkusStorkInfrastructure.java b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/QuarkusStorkInfrastructure.java index f96aaacbdbdec..37786b1c1b61a 100644 --- a/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/QuarkusStorkInfrastructure.java +++ b/extensions/smallrye-stork/runtime/src/main/java/io/quarkus/stork/QuarkusStorkInfrastructure.java @@ -2,7 +2,7 @@ import java.util.function.Supplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.smallrye.stork.integration.DefaultStorkInfrastructure; import io.vertx.core.Vertx; diff --git a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ClassConfigurationPropertiesUtil.java b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ClassConfigurationPropertiesUtil.java index d839beb2e30c2..c40ba364959aa 100644 --- a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ClassConfigurationPropertiesUtil.java +++ b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ClassConfigurationPropertiesUtil.java @@ -9,11 +9,11 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -53,9 +53,9 @@ final class ClassConfigurationPropertiesUtil { private static final Logger LOGGER = Logger.getLogger(ClassConfigurationPropertiesUtil.class); - private static final String VALIDATOR_CLASS = "javax.validation.Validator"; + private static final String VALIDATOR_CLASS = "jakarta.validation.Validator"; private static final String HIBERNATE_VALIDATOR_IMPL_CLASS = "org.hibernate.validator.HibernateValidator"; - private static final String CONSTRAINT_VIOLATION_EXCEPTION_CLASS = "javax.validation.ConstraintViolationException"; + private static final String CONSTRAINT_VIOLATION_EXCEPTION_CLASS = "jakarta.validation.ConstraintViolationException"; private final IndexView applicationIndex; private final YamlListObjectHandler yamlListObjectHandler; diff --git a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesBuildStep.java b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesBuildStep.java index c8c5922e6a7f0..19f7cb91c0e50 100644 --- a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesBuildStep.java +++ b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesBuildStep.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesUtil.java b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesUtil.java index e532fee80e329..cd46597bae21b 100644 --- a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesUtil.java +++ b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesUtil.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.function.IntFunction; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.config.Config; import org.jboss.jandex.DotName; diff --git a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/InterfaceConfigurationPropertiesUtil.java b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/InterfaceConfigurationPropertiesUtil.java index b8a085b95978e..7b642060b1cd9 100644 --- a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/InterfaceConfigurationPropertiesUtil.java +++ b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/InterfaceConfigurationPropertiesUtil.java @@ -10,8 +10,8 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DeploymentException; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/spring-boot-properties/runtime/src/main/java/io/quarkus/spring/boot/properties/runtime/SpringBootConfigProperties.java b/extensions/spring-boot-properties/runtime/src/main/java/io/quarkus/spring/boot/properties/runtime/SpringBootConfigProperties.java index 2bb26ef207f4f..9649313972da4 100644 --- a/extensions/spring-boot-properties/runtime/src/main/java/io/quarkus/spring/boot/properties/runtime/SpringBootConfigProperties.java +++ b/extensions/spring-boot-properties/runtime/src/main/java/io/quarkus/spring/boot/properties/runtime/SpringBootConfigProperties.java @@ -3,8 +3,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * This annotation is added as a qualifier to bean producer methods that produce @ConfigProperties beans diff --git a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/AnnotationOnClassTest.java b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/AnnotationOnClassTest.java index dcef6e211bdde..ac0b72fa40a60 100644 --- a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/AnnotationOnClassTest.java +++ b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/AnnotationOnClassTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/BasicTest.java b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/BasicTest.java index 8c18add69a8bb..3f0be45e2bf29 100644 --- a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/BasicTest.java +++ b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/BasicTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeKeyCacheTest.java b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeKeyCacheTest.java index 7f2f09896876a..77f5c30031008 100644 --- a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeKeyCacheTest.java +++ b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeKeyCacheTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UnsupportedAnnotationValueTest.java b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UnsupportedAnnotationValueTest.java index b61c612bae7f8..3f3206b273c09 100644 --- a/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UnsupportedAnnotationValueTest.java +++ b/extensions/spring-cache/deployment/src/test/java/io/quarkus/cache/test/runtime/UnsupportedAnnotationValueTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/spring-cloud-config-client/runtime/pom.xml b/extensions/spring-cloud-config-client/runtime/pom.xml index fab921fa06699..ed577fcc0b69d 100644 --- a/extensions/spring-cloud-config-client/runtime/pom.xml +++ b/extensions/spring-cloud-config-client/runtime/pom.xml @@ -77,8 +77,8 @@ test - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java index 36cdcbe800ce9..bf7010086e965 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java @@ -22,15 +22,15 @@ import java.util.TimeZone; import java.util.stream.Stream; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import org.jboss.jandex.DotName; import org.springframework.data.domain.Page; diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java index 9fd97dab1bd78..c3bb368e4d8b9 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.NoResultException; +import jakarta.persistence.NoResultException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java index f1adab61587c8..1e7e8655daf74 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java @@ -17,7 +17,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java index bb85dbef44800..133b8b2f1cb68 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.function.Consumer; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java index 763bb2a64e8a2..691eb8916e887 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java @@ -10,8 +10,8 @@ import java.util.Set; import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java index 891d29b0fa5f3..c719ced1638ae 100644 --- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java +++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java @@ -16,8 +16,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java index b158524796939..b9f00408571dd 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java @@ -7,10 +7,10 @@ import java.util.TimeZone; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class BasicTypeData { diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java index 512d9a2b57493..71c61785cc6fc 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java @@ -14,8 +14,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.assertj.core.data.Percentage; import org.hibernate.Hibernate; diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Book.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Book.java index 2af3e3a9d75f8..974e6d5f9411b 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Book.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Book.java @@ -1,7 +1,7 @@ package io.quarkus.spring.data.deployment; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Book { diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java index 1e777d8923f48..ea04e5b0bd2f3 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java @@ -2,10 +2,10 @@ import java.time.ZonedDateTime; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class LoginEvent { diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java index be7541b810ef8..4c3a98c3b7af5 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java @@ -5,8 +5,8 @@ import java.time.ZonedDateTime; import java.util.Optional; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java index ecd339b23be09..e780ed933071d 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java @@ -1,7 +1,7 @@ package io.quarkus.spring.data.deployment; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Person { diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java index b37799f1af191..a05654837876e 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table(name = "User_") diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/Book.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/Book.java index d89580f3cf651..3908487eebe0b 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/Book.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/Book.java @@ -1,7 +1,7 @@ package io.quarkus.spring.data.devmode; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Book { diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/BookResource.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/BookResource.java index d1ca42ec255d3..e85f2f815f5fc 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/BookResource.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/BookResource.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("/book") public class BookResource { diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java index 38aaca792001c..39eb7abc04c15 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java @@ -28,7 +28,7 @@ public void testRepositoryIsReloaded() { TEST.modifySourceFile("BookResource.java", s -> s.replace("// ", "@GET @Path(\"/{id}\") @Produces(MediaType.APPLICATION_JSON)\n" + - " public java.util.Optional findById(@javax.ws.rs.PathParam(\"id\") Integer id) {\n" + + " public java.util.Optional findById(@jakarta.ws.rs.PathParam(\"id\") Integer id) {\n" + " return bookRepository.findById(id);\n" + " }")); diff --git a/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java b/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java index 67f379e491c78..17e99255d4be0 100644 --- a/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java +++ b/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import io.quarkus.hibernate.orm.panache.Panache; import io.quarkus.hibernate.orm.panache.PanacheQuery; diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java index 6a3edcba16031..e3a95d8fcfd06 100644 --- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java +++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java @@ -1,6 +1,6 @@ package io.quarkus.spring.data.rest.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.logging.Logger; diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java index 097615fa3a0f3..bbdf467979e7b 100644 --- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java +++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.function.Predicate; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java index a2433afe36d77..aaa9c9209b21b 100644 --- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java +++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java @@ -8,7 +8,7 @@ import java.util.LinkedList; import java.util.List; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java index 3161b2f1e44ba..a1e1dddf00991 100644 --- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java +++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java @@ -1,6 +1,6 @@ package io.quarkus.spring.data.rest.deployment.crud; -import javax.persistence.Id; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.jboss.jandex.ClassInfo; diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java index 8c5b26290aca9..85b06c2d21ccf 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity { diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java index 89b6797dbc49b..0770a80a07a75 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java @@ -1,6 +1,6 @@ package io.quarkus.spring.data.rest.crud; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Record extends AbstractEntity { diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java index 03745e2d8430f..66484a0d200e5 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java @@ -2,9 +2,9 @@ import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity { diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java index 2abb353b9964b..087f42baa2473 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/EmptyListRecord.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/EmptyListRecord.java index 385efa6794099..28eeca7512a23 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/EmptyListRecord.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/EmptyListRecord.java @@ -1,6 +1,6 @@ package io.quarkus.spring.data.rest.paged; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EmptyListRecord extends AbstractEntity { diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java index 8a10c308e71c7..882df5bff7bd1 100644 --- a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java +++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java @@ -1,6 +1,6 @@ package io.quarkus.spring.data.rest.paged; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Record extends AbstractEntity { diff --git a/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java b/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java index 4275a62f2425e..4190cef528207 100644 --- a/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java +++ b/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.spring.data.rest.runtime; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jboss.logging.Logger; @@ -18,7 +18,7 @@ public Response toResponse(RestDataPanacheException exception) { } private Response throwableToResponse(Throwable throwable, String message) { - if (throwable instanceof javax.validation.ConstraintViolationException) { + if (throwable instanceof jakarta.validation.ConstraintViolationException) { return Response.status(Response.Status.BAD_REQUEST.getStatusCode(), message).build(); } diff --git a/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/jta/TransactionalUpdateExecutor.java b/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/jta/TransactionalUpdateExecutor.java index 9cccba32dd182..fa862b632905d 100644 --- a/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/jta/TransactionalUpdateExecutor.java +++ b/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/jta/TransactionalUpdateExecutor.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.inject.Singleton; -import javax.transaction.Transactional; +import jakarta.inject.Singleton; +import jakarta.transaction.Transactional; import io.quarkus.rest.data.panache.runtime.UpdateExecutor; diff --git a/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java b/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java index e350c767c53e5..9126aa2f04941 100644 --- a/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java +++ b/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.jandex.AnnotationInstance; @@ -73,7 +73,8 @@ public class SpringDIProcessor { private static final DotName CDI_SINGLETON_ANNOTATION = BuiltinScope.SINGLETON.getInfo().getDotName(); private static final DotName CDI_DEPENDENT_ANNOTATION = BuiltinScope.DEPENDENT.getInfo().getDotName(); private static final DotName CDI_REQUEST_SCOPED_ANNOTATION = BuiltinScope.REQUEST.getInfo().getDotName(); - private static final DotName CDI_SESSION_SCOPED_ANNOTATION = DotName.createSimple("javax.enterprise.context.SessionScoped"); + private static final DotName CDI_SESSION_SCOPED_ANNOTATION = DotName + .createSimple("jakarta.enterprise.context.SessionScoped"); private static final DotName CDI_APP_SCOPED_ANNOTATION = BuiltinScope.APPLICATION.getInfo().getDotName(); private static final DotName CDI_NAMED_ANNOTATION = DotNames.NAMED; private static final DotName CDI_INJECT_ANNOTATION = DotNames.INJECT; diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java index bcb35ee7e1c76..a9c1a249808b7 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanNameTest.java @@ -1,6 +1,6 @@ package io.quarkus.spring.di.deployment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java index fd2756615d1ba..f8a7c8858b549 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/BeanWithoutConfigurationTest.java @@ -1,7 +1,7 @@ package io.quarkus.spring.di.deployment; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/ListOfBeansTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/ListOfBeansTest.java index c1197cee9628c..3af74b8d00ec6 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/ListOfBeansTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/ListOfBeansTest.java @@ -4,7 +4,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java index 41e6975855dec..b704245415cc9 100644 --- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java +++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java @@ -14,12 +14,12 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; @@ -167,7 +167,7 @@ public void getAnnotationsToAddBeanMethodDefaultsToSingleton() { } /** - * Do not add javax.inject.Singleton, as it is not spring-specific and Arc processor already handles it. + * Do not add jakarta.inject.Singleton, as it is not spring-specific and Arc processor already handles it. * Otherwise, it would cause "declares multiple scope type annotations" error. */ @Test diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java index b6c80add50e21..0dc2ff8cd4c0e 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/InvalidCronExpressionTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java index 83b246833be32..16ec6524099ed 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/RepeatedScheduledMethodTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java index 1bc0e21e6fcf7..911e18be473ac 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringDelayedTest.java @@ -5,7 +5,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodsBean.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodsBean.java index 2e1bc29f4bedb..e5a642d91700c 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodsBean.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledMethodsBean.java @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.springframework.scheduling.annotation.Scheduled; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java index 45db58171f526..cf3468602177c 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java index 4cc5593b00bd5..b17b310d746ca 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayParamTest.java @@ -1,6 +1,6 @@ package io.quarkus.spring.scheduled.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java index ea02f1498cc79..7ae29918043d4 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedFixedDelayStringParamTest.java @@ -1,6 +1,6 @@ package io.quarkus.spring.scheduled.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java index ba8ce7cbb7e23..0a428d301b408 100644 --- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java +++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/UnsupportedInitialDelayForCronTest.java @@ -1,6 +1,6 @@ package io.quarkus.spring.scheduled.deployment; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/StringPropertyAccessorGenerator.java b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/StringPropertyAccessorGenerator.java index d9ac79496e8ec..41d6bbdecdbd9 100644 --- a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/StringPropertyAccessorGenerator.java +++ b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/StringPropertyAccessorGenerator.java @@ -4,7 +4,7 @@ import java.util.Set; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java index eace7340fbbd9..b3f79b4f7d2ab 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/BeanMethodCheckTest.java @@ -6,7 +6,7 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java index 02f30bc97a1ec..a824e690ea577 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/MetaAnnotationsTest.java @@ -6,7 +6,7 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java index a455095564a4c..9f445ca6647ce 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SecurityAnnotationMixingTest.java @@ -1,7 +1,7 @@ package io.quarkus.spring.security.deployment; -import javax.annotation.security.PermitAll; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.PermitAll; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java index 49137a03df6aa..aa164851f5522 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeClassAnnotatedTest.java @@ -6,7 +6,7 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java index d6cc9bb869cba..eaab4280b3647 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeTest.java @@ -6,7 +6,7 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java index c27f58dc84335..da26266e45019 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringPreAuthorizeWithExpressionsTest.java @@ -6,7 +6,7 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java index ff3d0b6ade1f4..1fd5cb4738f46 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/SpringSecuredAnnotatedTest.java @@ -4,8 +4,8 @@ import static io.quarkus.security.test.utils.SecurityTestUtils.assertFailureFor; import static io.quarkus.security.test.utils.SecurityTestUtils.assertSuccess; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityAnnotations.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityAnnotations.java index 08304b632ac75..e7852f5acf34e 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityAnnotations.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityAnnotations.java @@ -1,6 +1,6 @@ package io.quarkus.spring.security.deployment.app; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.springframework.security.access.annotation.Secured; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityMethodAnnotations.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityMethodAnnotations.java index 1eb60f6a21fd4..a60cd1767540f 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityMethodAnnotations.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/BeanWithSpringSecurityMethodAnnotations.java @@ -1,7 +1,7 @@ package io.quarkus.spring.security.deployment.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.springframework.security.access.annotation.Secured; diff --git a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/SpringSecuredSubClass.java b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/SpringSecuredSubClass.java index 0a179af7b45a2..153bb50d52ee6 100644 --- a/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/SpringSecuredSubClass.java +++ b/extensions/spring-security/deployment/src/test/java/io/quarkus/spring/security/deployment/app/SpringSecuredSubClass.java @@ -1,6 +1,6 @@ package io.quarkus.spring.security.deployment.app; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.springframework.security.access.annotation.Secured; diff --git a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringPreauthorizeInterceptor.java b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringPreauthorizeInterceptor.java index fe5d02942e9d4..49d146a369193 100644 --- a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringPreauthorizeInterceptor.java +++ b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringPreauthorizeInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.spring.security.runtime.interceptor; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecuredInterceptor.java b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecuredInterceptor.java index 86ef67a99818b..30a2886be418f 100644 --- a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecuredInterceptor.java +++ b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecuredInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.spring.security.runtime.interceptor; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.springframework.security.access.annotation.Secured; diff --git a/extensions/spring-web/core/common-runtime/pom.xml b/extensions/spring-web/core/common-runtime/pom.xml index b390650332744..5333d7c12395c 100644 --- a/extensions/spring-web/core/common-runtime/pom.xml +++ b/extensions/spring-web/core/common-runtime/pom.xml @@ -15,8 +15,8 @@ - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api jakarta.enterprise diff --git a/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/AbstractResponseContentTypeResolver.java b/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/AbstractResponseContentTypeResolver.java index b8429a0dc7c19..8b1d09e9bcf9b 100644 --- a/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/AbstractResponseContentTypeResolver.java +++ b/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/AbstractResponseContentTypeResolver.java @@ -1,14 +1,14 @@ package io.quarkus.spring.web.runtime.common; -import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.ACCEPT; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import java.util.List; import java.util.Objects; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Variant; public abstract class AbstractResponseContentTypeResolver { diff --git a/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseEntityConverter.java b/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseEntityConverter.java index 4980298b480f1..2a6848ef6679e 100644 --- a/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseEntityConverter.java +++ b/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseEntityConverter.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; diff --git a/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseStatusExceptionMapper.java b/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseStatusExceptionMapper.java index 9ac9c56997c21..c0c5e8d747048 100644 --- a/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseStatusExceptionMapper.java +++ b/extensions/spring-web/core/common-runtime/src/main/java/io/quarkus/spring/web/runtime/common/ResponseStatusExceptionMapper.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.springframework.http.HttpHeaders; import org.springframework.web.server.ResponseStatusException; diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/AbstractExceptionMapperGenerator.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/AbstractExceptionMapperGenerator.java index 620e25691a3b9..d0d940daea7b9 100644 --- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/AbstractExceptionMapperGenerator.java +++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/AbstractExceptionMapperGenerator.java @@ -3,9 +3,9 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java index b423c1e4d83a5..e3fe977dc9817 100644 --- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java +++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java @@ -7,14 +7,14 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; @@ -72,7 +72,7 @@ class ControllerAdviceExceptionMapperGenerator extends AbstractExceptionMapperGe /** * We need to go through each parameter of the method of the ControllerAdvice * and make sure it's supported - * The javax.ws.rs.ext.ExceptionMapper only has one parameter, the exception, however + * The jakarta.ws.rs.ext.ExceptionMapper only has one parameter, the exception, however * other parameters can be obtained using @Context and therefore injected into the target method */ @Override diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseBuilder.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseBuilder.java index e94a6130754ca..d9789bab8fbd3 100644 --- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseBuilder.java +++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseBuilder.java @@ -2,8 +2,8 @@ import static io.quarkus.gizmo.MethodDescriptor.ofMethod; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.gizmo.MethodCreator; import io.quarkus.gizmo.ResultHandle; diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseStatusOnExceptionGenerator.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseStatusOnExceptionGenerator.java index a6ad9cf5aca37..cf6394e19969a 100644 --- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseStatusOnExceptionGenerator.java +++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/ResponseStatusOnExceptionGenerator.java @@ -1,6 +1,6 @@ package io.quarkus.spring.web.deployment; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.jandex.ClassInfo; diff --git a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java index b6cb72bb3bffa..0ab486c20df71 100644 --- a/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java +++ b/extensions/spring-web/core/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/spring-web/resteasy-classic/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyClassicProcessor.java b/extensions/spring-web/resteasy-classic/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyClassicProcessor.java index 110c554380594..8ecb1818703ae 100644 --- a/extensions/spring-web/resteasy-classic/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyClassicProcessor.java +++ b/extensions/spring-web/resteasy-classic/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyClassicProcessor.java @@ -12,8 +12,8 @@ import java.util.Set; import java.util.function.Consumer; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Providers; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/spring-web/resteasy-classic/runtime/pom.xml b/extensions/spring-web/resteasy-classic/runtime/pom.xml index 121d9554dea66..52896d906c0aa 100644 --- a/extensions/spring-web/resteasy-classic/runtime/pom.xml +++ b/extensions/spring-web/resteasy-classic/runtime/pom.xml @@ -19,7 +19,7 @@ quarkus-resteasy - org.jboss.resteasy + org.jboss.resteasy.spring resteasy-spring-web diff --git a/extensions/spring-web/resteasy-classic/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyClassicResponseContentTypeResolver.java b/extensions/spring-web/resteasy-classic/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyClassicResponseContentTypeResolver.java index 298282d10b046..edfc8d5efc5b6 100644 --- a/extensions/spring-web/resteasy-classic/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyClassicResponseContentTypeResolver.java +++ b/extensions/spring-web/resteasy-classic/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyClassicResponseContentTypeResolver.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.core.request.ServerDrivenNegotiation; diff --git a/extensions/spring-web/resteasy-reactive/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyReactiveProcessor.java b/extensions/spring-web/resteasy-reactive/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyReactiveProcessor.java index 4a9b50fbedc87..60baf26c9432e 100644 --- a/extensions/spring-web/resteasy-reactive/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyReactiveProcessor.java +++ b/extensions/spring-web/resteasy-reactive/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebResteasyReactiveProcessor.java @@ -15,8 +15,8 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/extensions/spring-web/resteasy-reactive/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyReactiveResponseContentTypeResolver.java b/extensions/spring-web/resteasy-reactive/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyReactiveResponseContentTypeResolver.java index 2324cb923e5ae..a036095e78f4d 100644 --- a/extensions/spring-web/resteasy-reactive/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyReactiveResponseContentTypeResolver.java +++ b/extensions/spring-web/resteasy-reactive/runtime/src/main/java/io/quarkus/spring/web/runtime/ResteasyReactiveResponseContentTypeResolver.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.server.core.request.ServerDrivenNegotiation; diff --git a/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/TestController.java b/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/TestController.java index 4793707865885..26847be09c9d4 100644 --- a/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/TestController.java +++ b/extensions/spring-web/resteasy-reactive/tests/src/test/java/io/quarkus/spring/web/test/TestController.java @@ -1,6 +1,6 @@ package io.quarkus.spring.web.test; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/ServletConfig.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/ServletConfig.java index a028318c79bda..1ae8effc23588 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/ServletConfig.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/ServletConfig.java @@ -4,7 +4,7 @@ import java.util.Optional; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java index 6758ef0245712..bbc6400670510 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java @@ -5,7 +5,7 @@ import static io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic.AUTHENTICATE; import static io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic.DENY; import static io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic.PERMIT; -import static javax.servlet.DispatcherType.REQUEST; +import static jakarta.servlet.DispatcherType.REQUEST; import java.io.IOException; import java.util.ArrayList; @@ -18,21 +18,21 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.RunAs; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Typed; -import javax.inject.Inject; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.SessionTrackingMode; -import javax.servlet.annotation.HandlesTypes; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebFilter; -import javax.servlet.annotation.WebListener; -import javax.servlet.annotation.WebServlet; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.RunAs; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Typed; +import jakarta.inject.Inject; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.annotation.HandlesTypes; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebListener; +import jakarta.servlet.annotation.WebServlet; import org.jboss.annotation.javaee.Descriptions; import org.jboss.annotation.javaee.DisplayNames; @@ -146,7 +146,7 @@ public class UndertowBuildStep { public static final DotName MULTIPART_CONFIG = DotName.createSimple(MultipartConfig.class.getName()); public static final DotName SERVLET_SECURITY = DotName.createSimple(ServletSecurity.class.getName()); public static final DotName TYPED = DotName.createSimple(Typed.class.getName()); - protected static final String SERVLET_CONTAINER_INITIALIZER = "META-INF/services/javax.servlet.ServletContainerInitializer"; + protected static final String SERVLET_CONTAINER_INITIALIZER = "META-INF/services/jakarta.servlet.ServletContainerInitializer"; protected static final DotName HANDLES_TYPES = DotName.createSimple(HandlesTypes.class.getName()); @Inject @@ -516,7 +516,7 @@ public ServletDeploymentManagerBuildItem build(List servlets, } else { for (DispatcherType dispatcher : mapping.getDispatchers()) { recorder.addFilterURLMapping(deployment, mapping.getFilterName(), m, - javax.servlet.DispatcherType.valueOf(dispatcher.name())); + jakarta.servlet.DispatcherType.valueOf(dispatcher.name())); } } } @@ -528,7 +528,7 @@ public ServletDeploymentManagerBuildItem build(List servlets, } else { for (DispatcherType dispatcher : mapping.getDispatchers()) { recorder.addFilterServletNameMapping(deployment, mapping.getFilterName(), name, - javax.servlet.DispatcherType.valueOf(dispatcher.name())); + jakarta.servlet.DispatcherType.valueOf(dispatcher.name())); } } } diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilter.java index ab7cd800d495d..6303a8ccb2e60 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilter.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilter.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.util.Enumeration; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpFilter; @WebFilter(urlPatterns = "/*") public class AnnotatedFilter extends HttpFilter { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilterInitParam.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilterInitParam.java index adc162147f67d..8b050efb95d9e 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilterInitParam.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedFilterInitParam.java @@ -4,13 +4,13 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.http.HttpFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.http.HttpFilter; @WebFilter(urlPatterns = SERVLET_ENDPOINT, description = "Haha Filter", initParams = { @WebInitParam(name = "AnnotatedInitFilterParamName", value = "AnnotatedInitFilterParamValue", description = "Described filter init param") diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedListener.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedListener.java index b2d149b773b59..b9c08dff64d24 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedListener.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedListener.java @@ -1,8 +1,8 @@ package io.quarkus.undertow.test; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; @WebListener public class AnnotatedListener implements ServletContextListener { @@ -10,4 +10,4 @@ public class AnnotatedListener implements ServletContextListener { public void contextInitialized(ServletContextEvent sce) { sce.getServletContext().setAttribute("annotated listener", true); } -} \ No newline at end of file +} diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServlet.java index ef49bd5c21a96..c685937a747da 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServlet.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.security.RunAs; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.security.RunAs; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParam.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParam.java index 0fa259c525873..a11e2a31cc09b 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParam.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedServletInitParam.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = AnnotatedServletInitParam.SERVLET_ENDPOINT, initParams = { @WebInitParam(name = "AnnotatedInitParamName", value = "AnnotatedInitParamValue", description = "This is my init param") diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServlet.java index 98f1a83122c55..77073d4e4db0b 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ErrorServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/error") public class ErrorServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LoginLogoutServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LoginLogoutServlet.java index 6bac323fff3c9..560231ab815f8 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LoginLogoutServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LoginLogoutServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.security.AuthenticationFailedException; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java index 1bdb49eb58398..bab1b3210223d 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java @@ -7,14 +7,14 @@ import java.io.PrintWriter; import java.nio.charset.StandardCharsets; -import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java index dcec0f2b11c20..be56b75bc7ad3 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "named", urlPatterns = "/named") public class NamedServlet extends HttpServlet { @@ -16,4 +16,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se resp.getWriter().write("Hello World"); } -} \ No newline at end of file +} diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java index 9fc3ebb813533..13c01ce06a306 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; @WebFilter(filterName = "MyFilter", servletNames = "named", asyncSupported = true) public class NoUrlPatternWebFilter implements Filter { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/PreDestroyServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/PreDestroyServlet.java index 23a47380c7b5d..b7f62ad5a3b7b 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/PreDestroyServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/PreDestroyServlet.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.PreDestroy; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.PreDestroy; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/destroy", loadOnStartup = 1) public class PreDestroyServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedAnnotationServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedAnnotationServlet.java index 4ae228d29aa3b..4b95346ae0a23 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedAnnotationServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedAnnotationServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/roles-anno") @ServletSecurity(@HttpConstraint(rolesAllowed = "admin")) diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedBeanServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedBeanServlet.java index 1b2510bfe94e5..0a2eff3463f73 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedBeanServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/RolesAllowedBeanServlet.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/roles-bean") public class RolesAllowedBeanServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredAnnotationServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredAnnotationServlet.java index 7cdafc30c1e96..d0a17be109d1a 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredAnnotationServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredAnnotationServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/annotation/servlet") @ServletSecurity(@HttpConstraint(rolesAllowed = "admin")) diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredServlet.java index 139e93fc77c01..35bf6c7abb81d 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SecuredServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/secure/servlet") public class SecuredServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java index 3ead44e33b8df..7460719ec0ee5 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.containsString; -import javax.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContainerInitializer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java index 9be39e69b46e8..4c8a055e055a9 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContextInjectionTestCase.java @@ -1,7 +1,7 @@ package io.quarkus.undertow.test; -import javax.inject.Inject; -import javax.servlet.ServletContext; +import jakarta.inject.Inject; +import jakarta.servlet.ServletContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestGreeter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestGreeter.java index 9d3a101453b31..e05f3e1d14694 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestGreeter.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestGreeter.java @@ -1,6 +1,6 @@ package io.quarkus.undertow.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class TestGreeter { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java index 0f953ce8f16ef..b1c44663b3b65 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java @@ -3,14 +3,14 @@ import java.io.IOException; import java.util.Set; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.annotation.HandlesTypes; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.annotation.HandlesTypes; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @HandlesTypes({ SCIInterface.class, SCIAnnotation.class }) public class TestSCI implements ServletContainerInitializer { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServlet.java index cf57ad89f576f..1b8f80ef683aa 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/test") public class TestServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServletSubclass.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServletSubclass.java index 3a419f3138e00..206c1bfd283d3 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServletSubclass.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestServletSubclass.java @@ -1,6 +1,6 @@ package io.quarkus.undertow.test; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebServlet; @WebServlet(urlPatterns = "/test-sub") public class TestServletSubclass extends TestServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java index 025650926f8d5..25bdc596d3a20 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UndertowHandlersConfTestCase.java @@ -5,10 +5,10 @@ import java.io.IOException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UserServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UserServlet.java index ee8afd1bca95c..5eaa86cd6ffb7 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UserServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/UserServlet.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.security.Principal; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/user") public class UserServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlFilter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlFilter.java index b9a78c46a517b..a427a79886d34 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlFilter.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpFilter; public class WebXmlFilter extends HttpFilter { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsFilter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsFilter.java index 887eccf0e0b11..9c9f678eb967f 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsFilter.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class WebXmlInitParamsFilter implements Filter { private FilterConfig filterConfig; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsServlet.java index 2acd8ed27bbd4..c35459539834a 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlInitParamsServlet.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class WebXmlInitParamsServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlListener.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlListener.java index 94fd87226714f..8b21390594ada 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlListener.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlListener.java @@ -1,7 +1,7 @@ package io.quarkus.undertow.test; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; public class WebXmlListener implements ServletContextListener { @Override diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlServlet.java index 264a1761b2717..027448608c329 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebXmlServlet.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class WebXmlServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java index f31155bd2b847..84f5a8c4515ac 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.SessionScoped; @SessionScoped class Counter { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java index 79065f3455373..7ff0b591dacb7 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; @Dependent class ServletBuiltinBeanInjectingBean { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java index ebc2b73c64c38..ad39fd4fa23bc 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; @SuppressWarnings("serial") @WebServlet(urlPatterns = "/foo/*", name = "testServlet") diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/config/WebFilterConfigInjectionWarningsTest.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/config/WebFilterConfigInjectionWarningsTest.java index 53c5e1a9cbd4e..a6e2a3e04bec4 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/config/WebFilterConfigInjectionWarningsTest.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/config/WebFilterConfigInjectionWarningsTest.java @@ -10,17 +10,17 @@ import java.util.logging.LogRecord; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.enterprise.inject.Instance; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.hamcrest.Matchers; @@ -42,10 +42,11 @@ public class WebFilterConfigInjectionWarningsTest { assertEquals(1, logRecords.size()); Set messages = logRecords.stream().map(LogRecord::getMessage).collect(Collectors.toSet()); assertTrue(messages.contains( - "Directly injecting a org.eclipse.microprofile.config.inject.ConfigProperty into a javax.servlet" + + "Directly injecting a org.eclipse.microprofile.config.inject.ConfigProperty into a jakarta.servlet" + ".annotation.WebFilter may lead to unexpected results. To ensure proper results, please change the " + - "type of the field to javax.enterprise.inject.Instance. Offending field is " + + "type of the field to jakarta.enterprise.inject.Instance. Offending field is " + + "'configProperty' of class 'io.quarkus.undertow.test.config" + ".WebFilterConfigInjectionWarningsTest$ConfigFilter'")); }); diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/DevServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/DevServlet.java index 82979ea97a13b..98f9498d08cfb 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/DevServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/DevServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.runtime.BlockingOperationControl; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/NewServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/NewServlet.java index e87cd344ba9b7..04bfc1efac799 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/NewServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/devmode/NewServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.runtime.BlockingOperationControl; diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java index a6a5542c2e320..f34d3bedbc06a 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/pushed") public class MessageServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java index 49a6a3c5559cc..5b7833123e30f 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/push") public class ServerPushServlet extends HttpServlet { diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/Foo.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/Foo.java index 6ac0b844a1e0f..4e172706e407b 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/Foo.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/Foo.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.SessionScoped; @SessionScoped class Foo { @@ -19,4 +19,4 @@ long incrementAndGet() { return counter.incrementAndGet(); } -} \ No newline at end of file +} diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/TestServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/TestServlet.java index a7bcde11d1117..315dcec8cbac7 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/TestServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/TestServlet.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @SuppressWarnings("serial") @WebServlet(urlPatterns = "/foo") @@ -24,4 +24,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se resp.getWriter().write("count=" + foo.incrementAndGet()); } } -} \ No newline at end of file +} diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/TimeoutTestServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/TimeoutTestServlet.java index d894ca392fe1d..4ba024b8a86f3 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/TimeoutTestServlet.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/timeout/TimeoutTestServlet.java @@ -6,11 +6,11 @@ import java.io.UncheckedIOException; import java.util.stream.Collectors; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(urlPatterns = "/timeout") public class TimeoutTestServlet extends HttpServlet { diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java index 25a5d54942d29..388d1665d0984 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java @@ -6,15 +6,15 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.servlet.annotation.WebListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.servlet.annotation.WebListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.jboss.logging.Logger; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusErrorServlet.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusErrorServlet.java index 9515d858312f2..19f63cc1bf6f5 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusErrorServlet.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusErrorServlet.java @@ -5,11 +5,11 @@ import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.runtime.TemplateHtmlBuilder; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusExceptionHandler.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusExceptionHandler.java index 67ee278c3a72f..a2687e1a9bb09 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusExceptionHandler.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusExceptionHandler.java @@ -4,8 +4,8 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusIdentityManager.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusIdentityManager.java index 6d36a88ae24b3..e3239737bef2b 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusIdentityManager.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/QuarkusIdentityManager.java @@ -1,7 +1,7 @@ package io.quarkus.undertow.runtime; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletHttpSecurityPolicy.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletHttpSecurityPolicy.java index 7e288c80272ca..1e47c7ceb7859 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletHttpSecurityPolicy.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletHttpSecurityPolicy.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.vertx.http.runtime.security.HttpSecurityPolicy; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java index 56ca17ffaa3f6..d1c4ba9a5001b 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java @@ -1,11 +1,11 @@ package io.quarkus.undertow.runtime; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import io.undertow.servlet.handlers.ServletRequestContext; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java index aabc3a1964e85..90def7a486baa 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java @@ -15,20 +15,20 @@ import java.util.concurrent.ExecutorService; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.MultipartConfigElement; -import javax.servlet.Servlet; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.SessionTrackingMode; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.SessionTrackingMode; import org.jboss.logging.Logger; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowHandlersConfServletExtension.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowHandlersConfServletExtension.java index 6713542e9f96f..76a57cc6fba21 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowHandlersConfServletExtension.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowHandlersConfServletExtension.java @@ -5,7 +5,7 @@ import java.io.UncheckedIOException; import java.util.List; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import io.undertow.Handlers; import io.undertow.server.HandlerWrapper; diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java index 5fa77ba9d043e..b5b5caae5bc97 100644 --- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java +++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.function.Function; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebServlet; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/FilterBuildItem.java b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/FilterBuildItem.java index 3430dbd585e8c..9899ae25820fd 100644 --- a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/FilterBuildItem.java +++ b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/FilterBuildItem.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; import io.quarkus.builder.item.MultiBuildItem; import io.undertow.servlet.api.InstanceFactory; diff --git a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/ServletBuildItem.java b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/ServletBuildItem.java index a8d8bac4f039d..300a1c8442a89 100644 --- a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/ServletBuildItem.java +++ b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/ServletBuildItem.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.MultipartConfigElement; -import javax.servlet.Servlet; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.Servlet; import io.quarkus.builder.item.MultiBuildItem; import io.undertow.servlet.api.InstanceFactory; diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java index f28e4c68d1e5c..980bc8aaeaaf0 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.function.Supplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java index e22ce6ba2eb13..811e684bd75f6 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java @@ -3,8 +3,8 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java index 5caefddacfa33..7f06f93eee36b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConnectionLimitsTest.java @@ -6,8 +6,8 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java index 8fab0733e8aee..34c68e3d3503c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DecompressionTest.java @@ -6,8 +6,8 @@ import java.util.stream.IntStream; import java.util.zip.GZIPOutputStream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java index 38d86121b32a8..65e0d23e78197 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/DisableHttpPortTest.java @@ -7,8 +7,8 @@ import java.io.File; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHandlerInitializer.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHandlerInitializer.java index 39d8a596cc16a..ad8200b875184 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHandlerInitializer.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHandlerInitializer.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/HttpContinueHeaderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/HttpContinueHeaderTest.java index a2b4220cda4d6..35f59a01fee3b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/HttpContinueHeaderTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/HttpContinueHeaderTest.java @@ -4,8 +4,8 @@ import java.net.URL; import java.nio.charset.StandardCharsets; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java index bf70b20f36c1a..243bcca9b71c9 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java @@ -2,8 +2,8 @@ import java.util.function.Consumer; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java index 3fb3cb8cc186c..5299be7fcbb65 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java @@ -5,9 +5,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.awaitility.Awaitility; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java index 9470296d1eba0..3c2c997eb8257 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java @@ -2,8 +2,8 @@ import java.util.function.Consumer; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java index 916c98b5f1932..6527a9383f0b5 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java @@ -4,7 +4,7 @@ import java.net.URL; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java index cab8c3c78f11b..325aa99a9200e 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RootPathTest.java @@ -2,8 +2,8 @@ import static io.restassured.RestAssured.given; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java index b1d66f7001eb9..698376e023e14 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UnhandledExceptionTest.java @@ -5,8 +5,8 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java index f61c486cd98bf..4d212f4dfde50 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/UserRouteRegistrationTest.java @@ -3,9 +3,9 @@ import static io.restassured.RestAssured.given; import static org.assertj.core.api.Assertions.assertThat; -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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/BeanRegisteringRoute.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/BeanRegisteringRoute.java index 3b07f9455b55d..4d4a17e814afb 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/BeanRegisteringRoute.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/BeanRegisteringRoute.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.http.cors; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.vertx.core.Handler; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/customizers/HttpServerOptionsCustomizerTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/customizers/HttpServerOptionsCustomizerTest.java index 033667116ff4f..09d5837286134 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/customizers/HttpServerOptionsCustomizerTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/customizers/HttpServerOptionsCustomizerTest.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicInteger; -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.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java index f1320b95b70c3..116db1c8a43f1 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.devconsole; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.configuration.ConfigInstantiator; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/ConfigBean.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/ConfigBean.java index f837ccf3742af..2ebc09380fccf 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/ConfigBean.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/ConfigBean.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.devconsole; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java index 57e60c4c87194..a2644f677996e 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileCorrectlyEndpoint.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileCorrectlyEndpoint.java index b514f915f2c12..3bb49127ae5e9 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileCorrectlyEndpoint.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileCorrectlyEndpoint.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.http.devmode; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileErrorEndpoint.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileErrorEndpoint.java index 7149f2e7a61d6..f2f1650898265 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileErrorEndpoint.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/CompileErrorEndpoint.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.http.devmode; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java index 26b1f112b56d0..3a9d821f84861 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.vertx.http.devmode; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java index ee3b727a80a88..05b9b6a0b0688 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.vertx.http.devmode; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java index 1326a7744e4e2..3e2af8f032715 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/filters/UserFilterTest.java @@ -5,8 +5,8 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevBean.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevBean.java index 9310dfd698278..78a31fc0ebc2e 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevBean.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevBean.java @@ -1,8 +1,8 @@ package io.quarkus.vertx.http.hotreload; -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 io.quarkus.runtime.StartupEvent; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevFilter.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevFilter.java index fe2676a07d641..a3493a8ec8a35 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevFilter.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/DevFilter.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.http.hotreload; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.filters.Filters; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewBean.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewBean.java index 090d3bfa8ca5e..9b0f38d913ad3 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewBean.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewBean.java @@ -1,8 +1,8 @@ package io.quarkus.vertx.http.hotreload; -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 io.quarkus.runtime.StartupEvent; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewFilter.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewFilter.java index ce25ad98b5b4c..b6f7d3d7e7544 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewFilter.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/NewFilter.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.http.hotreload; -import javax.enterprise.event.Observes; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.filters.Filters; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusConsumer.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusConsumer.java index 336d5fbbf9d0f..7453a1ce37288 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusConsumer.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusConsumer.java @@ -1,9 +1,9 @@ package io.quarkus.vertx.http.hotreload; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import io.quarkus.runtime.StartupEvent; import io.vertx.core.Vertx; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusProducer.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusProducer.java index 2a68eacd41a1d..d023bcb1f231b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusProducer.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/hotreload/VertxEventBusProducer.java @@ -1,8 +1,8 @@ package io.quarkus.vertx.http.hotreload; -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 io.quarkus.runtime.StartupEvent; import io.vertx.core.Vertx; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java index 07ef39c6279fb..8d79b21ab3578 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2Test.java @@ -5,8 +5,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java index 9eab123124de3..0cb25d586d155 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/router/RouterEventTest.java @@ -2,8 +2,8 @@ import static org.hamcrest.Matchers.is; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/samesite/SetCookieHandler.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/samesite/SetCookieHandler.java index 7f1537ef8dd86..5886540f4a61c 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/samesite/SetCookieHandler.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/samesite/SetCookieHandler.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.samesite; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.vertx.core.Handler; import io.vertx.core.http.impl.CookieImpl; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AdminPathHandler.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AdminPathHandler.java index 4caa62496d64b..0fe98afe4d410 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AdminPathHandler.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AdminPathHandler.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.security; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser; import io.vertx.core.Handler; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CustomFormAuthChallengeTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CustomFormAuthChallengeTest.java index 696e130ec95d2..fc7ff866f05f4 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CustomFormAuthChallengeTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CustomFormAuthChallengeTest.java @@ -3,9 +3,9 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledProactiveSecIdentityProviderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledProactiveSecIdentityProviderTest.java index 6daddfe2fbe14..11bcd75daa8c8 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledProactiveSecIdentityProviderTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledProactiveSecIdentityProviderTest.java @@ -3,7 +3,7 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java index db46d3a08d521..cb29db211f3ea 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.http.security; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.security.AuthenticationFailedException; import io.quarkus.security.identity.AuthenticationRequestContext; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/HeaderAuthenticator.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/HeaderAuthenticator.java index 32e13c7e61d79..383eabe66c00f 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/HeaderAuthenticator.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/HeaderAuthenticator.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.security.identity.IdentityProviderManager; import io.quarkus.security.identity.SecurityIdentity; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/IdentityProviderTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/IdentityProviderTestCase.java index d45c291445741..2504e61b1be77 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/IdentityProviderTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/IdentityProviderTestCase.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -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.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java index fd694937243f2..2a651111126f0 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java @@ -5,8 +5,8 @@ import java.io.File; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java index 57f229e1abaa1..93a2a16e9ad3e 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestTest.java @@ -5,8 +5,8 @@ import java.io.File; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java index 0313c17600769..9457f81106d76 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequiredTest.java @@ -5,8 +5,8 @@ import java.io.File; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PathHandler.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PathHandler.java index f6e11b69bc47b..b89c0e9b83793 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PathHandler.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PathHandler.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.security; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser; import io.vertx.core.Handler; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/TestTrustedIdentityProvider.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/TestTrustedIdentityProvider.java index b7ae74ceed18e..2366a6b41ac66 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/TestTrustedIdentityProvider.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/TestTrustedIdentityProvider.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.security.AuthenticationFailedException; import io.quarkus.security.identity.AuthenticationRequestContext; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTest.java index e1c3f23d97001..b55c4c6f521f7 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTest.java @@ -6,8 +6,8 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutDefaultExecutorTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutDefaultExecutorTest.java index 9f31489f7961b..8435d0065e2f3 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutDefaultExecutorTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutDefaultExecutorTest.java @@ -7,10 +7,10 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.event.ObservesAsync; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.ObservesAsync; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutTest.java index 37e79597e5899..4607b42e2f272 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/shutdown/ShutdownTimeoutTest.java @@ -6,8 +6,8 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java index c7e96846065eb..0b74e031c0d6b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java @@ -5,8 +5,8 @@ import java.io.File; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java index e876ceb90ff38..3a3591f20327e 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java @@ -5,8 +5,8 @@ import java.io.File; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java index 85a09758d2c1c..448ba943f9e4e 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java @@ -5,8 +5,8 @@ import java.io.File; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterAll; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/HelloResource.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/HelloResource.java index 202a5d32a9f01..999dec34619aa 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/HelloResource.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/HelloResource.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.testrunner; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.vertx.core.Handler; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/StartupFailer.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/StartupFailer.java index e65fa8b11b5b0..935dfe6340bca 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/StartupFailer.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/StartupFailer.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.testrunner; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.runtime.LaunchMode; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/BrokenOnlyResource.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/BrokenOnlyResource.java index 472ea25e58f2c..f7b4c843bd87d 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/BrokenOnlyResource.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/BrokenOnlyResource.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.testrunner.brokenonly; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.vertx.core.Handler; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/Setup.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/Setup.java index 53bd7f3d0021e..e479563078593 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/Setup.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/Setup.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.testrunner.params; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.vertx.ext.web.Router; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentRequestProducer.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentRequestProducer.java index e6927333de7cf..412d886a8bd7b 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentRequestProducer.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentRequestProducer.java @@ -1,9 +1,9 @@ package io.quarkus.vertx.http.runtime; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import io.vertx.core.http.HttpServerRequest; import io.vertx.ext.web.RoutingContext; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java index 421d961a0a731..217c01185a875 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.http.runtime; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; import io.vertx.ext.web.RoutingContext; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/TrustedProxyCheckPartConverter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/TrustedProxyCheckPartConverter.java index 7e1c54a5b42e4..4b0346f26697d 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/TrustedProxyCheckPartConverter.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/TrustedProxyCheckPartConverter.java @@ -7,7 +7,7 @@ import java.util.function.BiPredicate; import java.util.regex.Pattern; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java index ff57c4c383896..9b4415ce8b7d5 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java @@ -35,7 +35,7 @@ import java.util.function.Supplier; import java.util.regex.Pattern; -import javax.enterprise.event.Event; +import jakarta.enterprise.event.Event; import org.crac.Resource; import org.jboss.logging.Logger; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java index 9d474916e889c..c5c18b76d2555 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java index 60566daba953d..62bc6b8ae8ef5 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.regex.Pattern; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java index f8738d9c63902..9268597154a76 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java @@ -8,8 +8,8 @@ import java.util.Set; import java.util.function.Function; -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthorizer.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthorizer.java index b5f61f6bcf3ae..defee73f0f714 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthorizer.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthorizer.java @@ -6,8 +6,8 @@ import java.util.function.BiFunction; import java.util.function.Consumer; -import javax.enterprise.inject.Instance; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java index 064b1c6dba6e0..6d4b707e542a5 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java @@ -9,7 +9,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import org.jboss.logging.Logger; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java index aad139cde70b2..52c2e0de186af 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java @@ -10,7 +10,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig; diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/core/deployment/VertxCoreProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/core/deployment/VertxCoreProcessor.java index b5fb5a0334c55..6fbce56e4dbe9 100644 --- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/core/deployment/VertxCoreProcessor.java +++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/core/deployment/VertxCoreProcessor.java @@ -15,7 +15,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecRegistrationTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecRegistrationTest.java index 046e2468258f1..b6c055d9291d2 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecRegistrationTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecRegistrationTest.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/DuplicatedContextTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/DuplicatedContextTest.java index c65ce08035d93..c1c83d58b7248 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/DuplicatedContextTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/DuplicatedContextTest.java @@ -8,8 +8,8 @@ import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/EventBusCodecTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/EventBusCodecTest.java index 1d4f6d3a97b71..dcd5f0ebd15cd 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/EventBusCodecTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/EventBusCodecTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/MutinyCodecTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/MutinyCodecTest.java index ccf61227d6c35..9ca11164405f3 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/MutinyCodecTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/MutinyCodecTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxContextSupportTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxContextSupportTest.java index f250c29fa7528..b34d631d355f8 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxContextSupportTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxContextSupportTest.java @@ -6,9 +6,9 @@ import java.util.function.Supplier; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java index 6af7ed791bc9b..9d2ca3a485fda 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java @@ -1,8 +1,8 @@ package io.quarkus.vertx; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/customizers/VertxOptionsCustomizerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/customizers/VertxOptionsCustomizerTest.java index 47cc596be71a1..1e19edf7f57f7 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/customizers/VertxOptionsCustomizerTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/customizers/VertxOptionsCustomizerTest.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.customizers; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/HeadersMessageConsumerMethodTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/HeadersMessageConsumerMethodTest.java index e929f6d435d6c..47e6f9c2ff5a8 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/HeadersMessageConsumerMethodTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/HeadersMessageConsumerMethodTest.java @@ -12,8 +12,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java index cc80a52a62335..393a4720d7314 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerContextTest.java @@ -8,8 +8,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java index 938df4ab9ee51..c282c6c1bb49a 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java @@ -10,7 +10,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java index 3fd71db859df2..abb459f515f87 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java @@ -14,8 +14,8 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/NonVoidMessageConsumerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/NonVoidMessageConsumerTest.java index 3ffabfb8dfc58..36bf36bcce842 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/NonVoidMessageConsumerTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/NonVoidMessageConsumerTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java index 85a6da915da98..26ae7792e998e 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java @@ -11,9 +11,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java index 5f97590be5f25..87467cb4f4678 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithClassNameDeploymentTest.java @@ -2,8 +2,8 @@ import java.util.concurrent.CountDownLatch; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java index 374b933901c67..fd5a0aaa060e7 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VerticleWithInstanceDeploymentTest.java @@ -2,8 +2,8 @@ import java.util.concurrent.CountDownLatch; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java index 29638bf251a58..62132dc16b5dc 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxCommonProducerTest.java @@ -4,8 +4,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java index 3961b2dcd7aa4..96b32b4863142 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxInjectionTest.java @@ -1,8 +1,8 @@ package io.quarkus.vertx.deployment; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java index 9c77a212b4a55..e79a05c241bdb 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxLoggingTest.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.deployment; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java index 4ae371e668a60..378685da9ec48 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/locals/LocalContextAccessTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/locals/LocalContextAccessTest.java index 35c465a2d7f2c..f6e0fcc7befa2 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/locals/LocalContextAccessTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/locals/LocalContextAccessTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/InMemoryLogHandlerProducer.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/InMemoryLogHandlerProducer.java index 84f25fe074b20..844aea4a5200c 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/InMemoryLogHandlerProducer.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/InMemoryLogHandlerProducer.java @@ -1,9 +1,9 @@ package io.quarkus.vertx.mdc; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.quarkus.bootstrap.logging.InitialConfigurator; import io.quarkus.runtime.ShutdownEvent; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VerticleDeployer.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VerticleDeployer.java index 3d181fd170b94..b08d9dc8b7c98 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VerticleDeployer.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VerticleDeployer.java @@ -1,8 +1,8 @@ package io.quarkus.vertx.mdc; -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.jboss.logging.Logger; import org.jboss.logging.MDC; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VertxMDCTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VertxMDCTest.java index e7149236b0510..9d42a80fbf728 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VertxMDCTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/mdc/VertxMDCTest.java @@ -19,7 +19,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.logging.Logger; import org.jboss.logging.MDC; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyBeanVerticle.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyBeanVerticle.java index b39c4e85376d8..4d40500b6f850 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyBeanVerticle.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyBeanVerticle.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.verticles; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyUndeployedVerticle.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyUndeployedVerticle.java index 8d09e2c02753b..e8392532d9a7a 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyUndeployedVerticle.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/MyUndeployedVerticle.java @@ -1,7 +1,7 @@ package io.quarkus.vertx.verticles; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.vertx.core.AbstractVerticle; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/NotDeployedVerticle.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/NotDeployedVerticle.java index b313e1e2b8450..d6e1d98c51226 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/NotDeployedVerticle.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/NotDeployedVerticle.java @@ -1,6 +1,6 @@ package io.quarkus.vertx.verticles; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.vertx.core.AbstractVerticle; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeployer.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeployer.java index c968583bc3025..4f2141387c160 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeployer.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeployer.java @@ -1,8 +1,8 @@ package io.quarkus.vertx.verticles; -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 io.quarkus.runtime.StartupEvent; import io.vertx.mutiny.core.Vertx; diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeploymentTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeploymentTest.java index 942714065bcfd..62a465c385530 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeploymentTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/verticles/VerticleDeploymentTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java index 822b59543fd63..7e1dd5230130b 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java @@ -2,15 +2,15 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.spi.Context; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/PostResource.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/PostResource.java index 5343f3c6393ed..f595f6478dcdf 100644 --- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/PostResource.java +++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/PostResource.java @@ -1,8 +1,8 @@ package io.quarkus.webjar.locator.test; -import javax.annotation.PreDestroy; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.PreDestroy; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/post") public class PostResource { diff --git a/extensions/websockets/client/deployment/src/main/java/io/quarkus/websockets/client/deployment/WebsocketClientProcessor.java b/extensions/websockets/client/deployment/src/main/java/io/quarkus/websockets/client/deployment/WebsocketClientProcessor.java index d66ea74330cb6..b225246309f51 100644 --- a/extensions/websockets/client/deployment/src/main/java/io/quarkus/websockets/client/deployment/WebsocketClientProcessor.java +++ b/extensions/websockets/client/deployment/src/main/java/io/quarkus/websockets/client/deployment/WebsocketClientProcessor.java @@ -7,13 +7,13 @@ import java.util.Optional; import java.util.Set; -import javax.websocket.ClientEndpoint; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.server.ServerApplicationConfig; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.server.ServerApplicationConfig; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/TestWebSocketClient.java b/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/TestWebSocketClient.java index 83744638f7a29..4e8a37d6295fb 100644 --- a/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/TestWebSocketClient.java +++ b/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/TestWebSocketClient.java @@ -3,8 +3,8 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; @ClientEndpoint public class TestWebSocketClient { diff --git a/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/WebSocketClientTestCase.java b/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/WebSocketClientTestCase.java index 0324e23e757dd..f9c8fa9bdb916 100644 --- a/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/WebSocketClientTestCase.java +++ b/extensions/websockets/client/deployment/src/test/java/io/quarkus/websockets/test/WebSocketClientTestCase.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.websocket.ContainerProvider; +import jakarta.websocket.ContainerProvider; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/BearerTokenClientEndpointConfigurator.java b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/BearerTokenClientEndpointConfigurator.java index 9ad0b31a49d1b..7953ef312bc6b 100644 --- a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/BearerTokenClientEndpointConfigurator.java +++ b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/BearerTokenClientEndpointConfigurator.java @@ -5,10 +5,11 @@ import java.util.Map; import javax.net.ssl.SSLContext; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.Decoder; -import javax.websocket.Encoder; -import javax.websocket.Extension; + +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.Decoder; +import jakarta.websocket.Encoder; +import jakarta.websocket.Extension; import io.vertx.core.http.HttpHeaders; @@ -55,6 +56,7 @@ public Map getUserProperties() { return Collections.emptyMap(); } + @Override public SSLContext getSSLContext() { return null; } diff --git a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/ServerWebSocketContainerFactory.java b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/ServerWebSocketContainerFactory.java index 57e610501c831..54e3c8442be88 100644 --- a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/ServerWebSocketContainerFactory.java +++ b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/ServerWebSocketContainerFactory.java @@ -6,7 +6,7 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import javax.websocket.Extension; +import jakarta.websocket.Extension; import io.netty.channel.EventLoopGroup; import io.undertow.websockets.ServerWebSocketContainer; diff --git a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java index 670656f1a0a5a..9e97fa2c37da5 100644 --- a/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java +++ b/extensions/websockets/client/runtime/src/main/java/io/quarkus/websockets/client/runtime/WebsocketCoreRecorder.java @@ -7,11 +7,11 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import javax.enterprise.inject.Instance; -import javax.websocket.DeploymentException; -import javax.websocket.Endpoint; -import javax.websocket.server.ServerApplicationConfig; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.enterprise.inject.Instance; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Endpoint; +import jakarta.websocket.server.ServerApplicationConfig; +import jakarta.websocket.server.ServerEndpointConfig; import org.jboss.logging.Logger; diff --git a/extensions/websockets/server/deployment/src/main/java/io/quarkus/websockets/deployment/ServerWebSocketProcessor.java b/extensions/websockets/server/deployment/src/main/java/io/quarkus/websockets/deployment/ServerWebSocketProcessor.java index cbff174071b16..9f1c5f308e064 100644 --- a/extensions/websockets/server/deployment/src/main/java/io/quarkus/websockets/deployment/ServerWebSocketProcessor.java +++ b/extensions/websockets/server/deployment/src/main/java/io/quarkus/websockets/deployment/ServerWebSocketProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Optional; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpoint; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoService.java b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoService.java index e8258090f203b..860feb18a38e8 100644 --- a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoService.java +++ b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoService.java @@ -1,6 +1,6 @@ package io.quarkus.websockets.test; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class EchoService { diff --git a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoWebSocket.java b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoWebSocket.java index 1f5c7a84c4a4b..205d0d6b6910d 100644 --- a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoWebSocket.java +++ b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/EchoWebSocket.java @@ -1,8 +1,8 @@ package io.quarkus.websockets.test; -import javax.inject.Inject; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.inject.Inject; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo") public class EchoWebSocket { diff --git a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketDevModeTestCase.java b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketDevModeTestCase.java index bc7aaac5fe6a9..d23764ca5296a 100644 --- a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketDevModeTestCase.java +++ b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketDevModeTestCase.java @@ -5,12 +5,12 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java index 84e353941dc56..a0c823eb99fc9 100644 --- a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java +++ b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java @@ -4,12 +4,12 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Assertions; diff --git a/extensions/websockets/server/runtime/src/main/java/io/quarkus/websockets/runtime/WebsocketServerRecorder.java b/extensions/websockets/server/runtime/src/main/java/io/quarkus/websockets/runtime/WebsocketServerRecorder.java index 51016e71247e1..d5ddec395d3db 100644 --- a/extensions/websockets/server/runtime/src/main/java/io/quarkus/websockets/runtime/WebsocketServerRecorder.java +++ b/extensions/websockets/server/runtime/src/main/java/io/quarkus/websockets/runtime/WebsocketServerRecorder.java @@ -7,8 +7,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.websocket.DeploymentException; -import javax.websocket.Extension; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Extension; import org.jboss.logging.Logger; diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 963f7c57c6403..289d0292e34b7 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -35,22 +35,24 @@ + 1.0.0 + 5.0.0 UTF-8 11 11 11 - 2.0.2 - 1.3.3 + 4.0.1 + 2.0.1 3.0.5 5.9.2 3.8.7 3.24.2 3.5.0.Final - 1.3.5 + 2.1.1 1.6.0.Final - 2.2.3 - 1.8.0 + 3.0.0 + 2.1.0 3.0.0-M8 1.6.8 diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java index 4a6dd5c88542b..12c9f10614ccd 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java @@ -16,15 +16,15 @@ import java.util.Queue; import java.util.Set; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Intercepted; -import javax.enterprise.inject.Model; -import javax.inject.Named; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Intercepted; +import jakarta.enterprise.inject.Model; +import jakarta.inject.Named; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java index c1377c40cf962..42c1177ed4736 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java @@ -10,7 +10,7 @@ import org.jboss.jandex.DotName; /** - * Synthetic bean configurator. An alternative to {@link javax.enterprise.inject.spi.configurator.BeanConfigurator}. + * Synthetic bean configurator. An alternative to {@link jakarta.enterprise.inject.spi.configurator.BeanConfigurator}. *

    * This construct is not thread-safe and should not be re-used. * diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java index a37f616558041..fa2730bba6518 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java @@ -10,8 +10,8 @@ import java.util.Set; import java.util.function.Consumer; -import javax.enterprise.context.NormalScope; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.NormalScope; +import jakarta.enterprise.context.spi.CreationalContext; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; @@ -158,7 +158,8 @@ public THIS name(String name) { } /** - * Unlike for the {@link #name(String)} method a new {@link javax.inject.Named} qualifier with the specified value is added + * Unlike for the {@link #name(String)} method a new {@link jakarta.inject.Named} qualifier with the specified value is + * added * to the configured bean. * * @param name diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java index dad5f355c0d2d..c2fb9ac8493d8 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java @@ -25,9 +25,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.event.Reception; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java index 7b93819ac93a3..55d080c87f5d3 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; /** * Makes it possible to validate the bean deployment and also to skip some validation rules for specific components. diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java index fea18c51b3f30..323dd070705ba 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java @@ -25,13 +25,13 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.CreationException; -import javax.enterprise.inject.IllegalProductException; -import javax.enterprise.inject.literal.InjectLiteral; -import javax.enterprise.inject.spi.InterceptionType; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.CreationException; +import jakarta.enterprise.inject.IllegalProductException; +import jakarta.enterprise.inject.literal.InjectLiteral; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java index b71636e5899b8..b1d40056dff4c 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java @@ -18,9 +18,9 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.DeploymentException; -import javax.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.InterceptionType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java index 6e187fd6cf774..54fb313bceb20 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java @@ -23,7 +23,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; @@ -687,7 +687,7 @@ public void setAllowMocking(boolean allowMocking) { *

  • does not have a name,
    • *
  • does not declare an observer,
    • *
  • does not declare any producer which is eligible for injection to any injection point,
    • - *
  • is not directly eligible for injection into any {@link javax.enterprise.inject.Instance} injection point
    • + *
  • is not directly eligible for injection into any {@link jakarta.enterprise.inject.Instance} injection point
    • * * * @param removeUnusedBeans diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java index 45c2febb4a6a9..c4be961818557 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.AmbiguousResolutionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.Type; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java index 2be7e8e9fd397..45b71117afc16 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.AmbiguousResolutionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassType; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java index b22eaeaa4e83b..ff6515f5462e1 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java @@ -14,10 +14,10 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.enterprise.inject.AmbiguousResolutionException; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java index 2b64aadfa9d2f..34b5c6c80becd 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java @@ -10,7 +10,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; @@ -222,7 +222,7 @@ private static void generateEventBytecode(GeneratorContext ctx) { ResultHandle qualifiers = ctx.constructor.newInstance(MethodDescriptor.ofConstructor(HashSet.class)); if (!ctx.injectionPoint.getRequiredQualifiers().isEmpty()) { // Set instanceProvider1Qualifiers = new HashSet<>() - // instanceProvider1Qualifiers.add(javax.enterprise.inject.Default.Literal.INSTANCE) + // instanceProvider1Qualifiers.add(jakarta.enterprise.inject.Default.Literal.INSTANCE) for (AnnotationInstance qualifierAnnotation : ctx.injectionPoint.getRequiredQualifiers()) { BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation); @@ -342,15 +342,15 @@ private static void validateInstance(InjectionTargetInfo injectionTarget, Inject Consumer errors) { if (injectionPoint.getType().kind() != Kind.PARAMETERIZED_TYPE) { errors.accept( - new DefinitionException("An injection point of raw type javax.enterprise.inject.Instance is defined: " + new DefinitionException("An injection point of raw type jakarta.enterprise.inject.Instance is defined: " + injectionPoint.getTargetInfo())); } else if (injectionPoint.getRequiredType().kind() == Kind.WILDCARD_TYPE) { errors.accept( - new DefinitionException("Wildcard is not a legal type argument for javax.enterprise.inject.Instance: " + + new DefinitionException("Wildcard is not a legal type argument for jakarta.enterprise.inject.Instance: " + injectionPoint.getTargetInfo())); } else if (injectionPoint.getRequiredType().kind() == Kind.TYPE_VARIABLE) { errors.accept(new DefinitionException( - "Type variable is not a legal type argument for javax.enterprise.inject.Instance: " + + "Type variable is not a legal type argument for jakarta.enterprise.inject.Instance: " + injectionPoint.getTargetInfo())); } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java index be7a9593e7e10..c327aa7a427ed 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java @@ -2,8 +2,8 @@ import java.util.Collections; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; import org.jboss.jandex.AnnotationInstance; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java index d82db985f3f3d..d664b561671e1 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java @@ -2,10 +2,10 @@ import java.lang.annotation.Annotation; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java index c94a00dacc1d5..ab8f8959372f2 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ContextConfigurator.java @@ -9,7 +9,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.enterprise.context.NormalScope; +import jakarta.enterprise.context.NormalScope; import io.quarkus.arc.ContextCreator; import io.quarkus.arc.InjectableContext; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java index efb373a015d12..8c590ad6c92b2 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Decorators.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java index 36154d5d65838..7b0a75d9dc251 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java index 49c68aee322ff..da22e32021567 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java @@ -9,45 +9,45 @@ import java.util.OptionalInt; import java.util.OptionalLong; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.event.ObservesAsync; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Intercepted; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.TransientReference; -import javax.enterprise.inject.Typed; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.EventMetadata; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.util.Nonbinding; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Intercepted; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.TransientReference; +import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.EventMetadata; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java index 3bc805bc94fdc..c5b6d86ee76db 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java index 78466bf6b7ac6..1c7fc38972e45 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InjectionPointInfo.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java index 1412b55312c5d..e9c737780c16f 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorBindingRegistrar.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.function.Predicate; -import javax.enterprise.util.Nonbinding; +import jakarta.enterprise.util.Nonbinding; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java index cfd885fbfb6a3..0ce5a09586659 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java @@ -14,8 +14,8 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.enterprise.inject.spi.InterceptionType; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; @@ -180,7 +180,7 @@ protected void implementGetPriority(ClassCreator creator, InterceptorInfo interc /** * * @return the method - * @see InjectableInterceptor#intercepts(javax.enterprise.inject.spi.InterceptionType) + * @see InjectableInterceptor#intercepts(jakarta.enterprise.inject.spi.InterceptionType) */ protected void implementIntercepts(ClassCreator creator, InterceptorInfo interceptor) { MethodCreator intercepts = creator.getMethodCreator("intercepts", boolean.class, InterceptionType.class) @@ -206,7 +206,7 @@ private void addIntercepts(InterceptorInfo interceptor, InterceptionType interce /** * - * @see InjectableInterceptor#intercept(InterceptionType, Object, javax.interceptor.InvocationContext) + * @see InjectableInterceptor#intercept(InterceptionType, Object, jakarta.interceptor.InvocationContext) */ protected void implementIntercept(ClassCreator creator, InterceptorInfo interceptor, ProviderType providerType, ReflectionRegistration reflectionRegistration, boolean isApplicationClass) { diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java index cafe46771b218..2438fe6045ac9 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.InterceptionType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; @@ -90,7 +90,7 @@ private MethodInfo validateSignature(MethodInfo method) { if (parameters.size() != 1 || !(parameters.get(0).name().equals(DotNames.INVOCATION_CONTEXT) || parameters.get(0).name().equals(DotNames.ARC_INVOCATION_CONTEXT))) { throw new IllegalStateException( - "An interceptor method must accept exactly one parameter of type javax.interceptor.InvocationContext: " + "An interceptor method must accept exactly one parameter of type jakarta.interceptor.InvocationContext: " + method + " declared on " + method.declaringClass()); } if (!method.returnType().kind().equals(Type.Kind.VOID) && diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java index 2b6f07aa3e9f0..4ef049210a6ba 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.InterceptionType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java index 5cbb002271ee1..ffdfa737f351e 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java index f1762c7db4aa7..970c768e45c31 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java @@ -12,12 +12,12 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.context.spi.Context; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.EventMetadata; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.EventMetadata; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java index f993b93ea534f..4f1d0eb4f743f 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java @@ -15,7 +15,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java index 01ece104c26b0..b498242cdc2f4 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverConfigurator.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.function.Consumer; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.spi.ObserverMethod; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java index 5db8a410af2fe..608e74cb56445 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java @@ -23,12 +23,12 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.ObserverMethod; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java index c593fa4d423f0..009188098f290 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java @@ -12,10 +12,10 @@ import java.util.Set; import java.util.function.Consumer; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.ObserverMethod; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java index 146d7739a71ba..3d7883c42ae3b 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverTransformer.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.Set; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.MethodInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java index 0c275eeeb338f..f9301c3d8b01a 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.jboss.jandex.DotName; @@ -14,7 +14,8 @@ public interface QualifierRegistrar extends BuildExtension { /** * Returns a map of additional qualifers where the key represents the annotation type and the value is an optional set of - * non-binding members. Here, "non-binding" is meant in the sense of {@code javax.enterprise.util.Nonbinding}. I.e. members + * non-binding members. Here, "non-binding" is meant in the sense of {@code jakarta.enterprise.util.Nonbinding}. I.e. + * members * named in the set will be ignored when the CDI container is selecting a bean instance for a particular injection point. */ Map> getAdditionalQualifiers(); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java index 1c8259569ef04..bb195fc3c763a 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeRegistrar.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Stereotype; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java index 4f3da34dd5eff..dcd1c2cfa8696 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java @@ -23,9 +23,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.InterceptionType; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java index 92f61b5a91c1a..aeb52b2e97195 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.function.BiConsumer; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java index 35ed23d0d5dca..8f1685614a581 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AnnotationLiteralProcessorTest.java @@ -10,7 +10,7 @@ import java.util.Collection; import java.util.Collections; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java index c45159d440a80..463818dd2ef76 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/SubclassSkipPredicateTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java index bcf5651f7bb2a..b9153c14d6ad3 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java index 827bc41a81e2e..07cd8b446d84e 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Bar.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class Bar { diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java index 2258a70e3716d..9a6dbb15b211f 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Baz.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @Dependent public class Baz { diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java index eee8bc6102bd4..0efda9f9c02a3 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/Foo.java @@ -2,9 +2,9 @@ import java.util.AbstractList; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Default; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Default; @Dependent @Default diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java index aae68ef90f8d0..9e2d732b9f797 100644 --- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java +++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/types/FooQualifier.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Inherited diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java index cbe377b26d3db..c1f2c5c108262 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/All.java @@ -10,10 +10,10 @@ import java.lang.annotation.Target; import java.util.List; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * The container provides a synthetic bean for an injection point with the required type {@link List} and the required qualifier diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java index 0c48f47a847d2..48be16ec02521 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AlternativePriority.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Alternative; /** * If a bean is annotated with this annotation, it is considered an enabled alternative with given priority. @@ -13,7 +13,7 @@ * * This annotation can be used not only on bean classes, but also method and field producers (unlike pure {@code Priority}). * - * @deprecated Use {@link Alternative} and {@link io.quarkus.arc.Priority}/{@link javax.annotation.Priority} instead + * @deprecated Use {@link Alternative} and {@link io.quarkus.arc.Priority}/{@link jakarta.annotation.Priority} instead */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD }) diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java index 19f49a9b2de57..7dcbcbbedb8a6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java @@ -7,10 +7,10 @@ import java.util.concurrent.ExecutorService; import java.util.function.Supplier; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.util.TypeLiteral; /** * Represents a container instance. @@ -21,7 +21,7 @@ public interface ArcContainer { /** * Unlike {@link BeanManager#getContext(Class)} this method does not throw - * {@link javax.enterprise.context.ContextNotActiveException} if there is no active context for the given + * {@link jakarta.enterprise.context.ContextNotActiveException} if there is no active context for the given * scope. * * @param scopeType @@ -199,7 +199,7 @@ public interface ArcContainer { /** * Note that ambiguous names are detected at build time. Therefore, unlike - * {@link javax.enterprise.inject.spi.BeanManager.getBeans(String)} this method either returns a resolved bean or + * {@link jakarta.enterprise.inject.spi.BeanManager.getBeans(String)} this method either returns a resolved bean or * {@code null} if no bean matches. * * @param name @@ -211,7 +211,7 @@ public interface ArcContainer { /** * This method never throws {@link ContextNotActiveException}. * - * @return the built-in context for {@link javax.enterprise.context.RequestScoped} + * @return the built-in context for {@link jakarta.enterprise.context.RequestScoped} */ ManagedContext requestContext(); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java index a27daed536e0f..b15982d545b88 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInvocationContext.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; /** * Enhanced version of {@link InvocationContext}. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AsyncObserverExceptionHandler.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AsyncObserverExceptionHandler.java index f5bc805fe4f5b..c93fc8aa566af 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AsyncObserverExceptionHandler.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/AsyncObserverExceptionHandler.java @@ -1,17 +1,17 @@ package io.quarkus.arc; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.ObserverMethod; /** * Handles an exception thrown by an asynchronous observer. By default, an error message is logged. *

    * Note that the exception aborts processing of the observer but not of the async event. *

    - * A bean that implements this interface should be {@link javax.inject.Singleton} or - * {@link javax.enterprise.context.ApplicationScoped}. + * A bean that implements this interface should be {@link jakarta.inject.Singleton} or + * {@link jakarta.enterprise.context.ApplicationScoped}. * - * @see javax.enterprise.event.ObservesAsync + * @see jakarta.enterprise.event.ObservesAsync */ public interface AsyncObserverExceptionHandler { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java index ac5f36e23f98e..b8c56b79345b1 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanCreator.java @@ -2,8 +2,8 @@ import java.util.Map; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; /** * It can be used by synthetic {@link InjectableBean} definitions to produce a contextual instance. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java index d50fdc3f638fd..c5eeb0af51d43 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java @@ -4,8 +4,8 @@ import java.io.IOException; import java.util.Map; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; /** * It can be used by synthetic {@link InjectableBean} definitions to destroy a contextual instance. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java index 2d782dd059cf7..3aed342708994 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java @@ -54,7 +54,7 @@ public Supplier> getRemovedBeans() { * Values in the map are never null. * * @return a map of fully-qualified class names of all custom qualifiers to the set of non-binding members - * @see javax.enterprise.util.Nonbinding + * @see jakarta.enterprise.util.Nonbinding */ public Map> getQualifierNonbindingMembers() { return qualifierNonbindingMembers; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ContextInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ContextInstanceHandle.java index 17d0dd5f9e3ac..35b87182ee9a5 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ContextInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ContextInstanceHandle.java @@ -9,7 +9,7 @@ public interface ContextInstanceHandle extends InstanceHandle { /** * Destroy the instance as defined by - * {@link javax.enterprise.context.spi.Contextual#destroy(Object, javax.enterprise.context.spi.CreationalContext)}. + * {@link jakarta.enterprise.context.spi.Contextual#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}. */ void destroy(); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java index 811600e553846..c448fe65f4103 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/CurrentContextFactory.java @@ -6,8 +6,8 @@ /** * This factory can be used to create a new {@link CurrentContext} for a normal scope, e.g. for - * {@link javax.enterprise.context.RequestScoped}. It's usually not necessary for shared contexts, such as - * {@link javax.enterprise.context.ApplicationScoped}. + * {@link jakarta.enterprise.context.RequestScoped}. It's usually not necessary for shared contexts, such as + * {@link jakarta.enterprise.context.ApplicationScoped}. */ public interface CurrentContextFactory { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java index 129c418bcbb7b..4e058aa521754 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java @@ -5,11 +5,11 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; import io.quarkus.arc.impl.Qualifiers; @@ -130,7 +130,7 @@ default boolean isSuppressed() { /** * A bean may have a priority assigned. *

    - * Class-based beans can specify the priority declaratively via {@link javax.annotation.Priority} and + * Class-based beans can specify the priority declaratively via {@link jakarta.annotation.Priority} and * {@link io.quarkus.arc.Priority}. If no priority annotation is used then a bean has the priority of value 0. *

    * This priority is used to sort the resolved beans when performing programmatic lookup via diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java index e03e954a5e1e0..027b5c2bc5ef8 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java @@ -3,11 +3,11 @@ import java.util.Map; import java.util.function.Function; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.NormalScope; -import javax.enterprise.context.spi.AlterableContext; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.NormalScope; +import jakarta.enterprise.context.spi.AlterableContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; /** * A context implementing this interface makes it possible to capture and view its state via the {@link ContextState}. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableDecorator.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableDecorator.java index b6135d3802b7b..98af86b9f6a11 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableDecorator.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableDecorator.java @@ -1,6 +1,6 @@ package io.quarkus.arc; -import javax.enterprise.inject.spi.Decorator; +import jakarta.enterprise.inject.spi.Decorator; /** * Quarkus representation of a decorator bean. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java index 1cdd2efaf401e..6c205741e39f1 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInstance.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.util.Iterator; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.util.TypeLiteral; /** * Enhanced version of {@link Instance}. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInterceptor.java index 8f3ba72393663..77c3fc2fca8f6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableInterceptor.java @@ -1,6 +1,6 @@ package io.quarkus.arc; -import javax.enterprise.inject.spi.Interceptor; +import jakarta.enterprise.inject.spi.Interceptor; /** * Quarkus representation of an interceptor bean. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java index 29e139bbcda7e..2ecc487e587c9 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableObserverMethod.java @@ -4,9 +4,9 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.event.Reception; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.event.Reception; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.spi.ObserverMethod; /** * Represents an observer method. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableReferenceProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableReferenceProvider.java index fabf2583c7afc..22763ccde57d9 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableReferenceProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableReferenceProvider.java @@ -1,6 +1,6 @@ package io.quarkus.arc; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; /** * diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceHandle.java index 9d08d1a9083ca..c03ba183b3dfc 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceHandle.java @@ -1,7 +1,8 @@ package io.quarkus.arc; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.AlterableContext; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.AlterableContext; +import jakarta.enterprise.inject.Instance; /** * Represents an instance handle. @@ -10,7 +11,7 @@ * * @param */ -public interface InstanceHandle extends AutoCloseable { +public interface InstanceHandle extends AutoCloseable, Instance.Handle { /** * @@ -40,10 +41,11 @@ default T orElse(T other) { /** * Destroy the instance as defined by - * {@link javax.enterprise.context.spi.Contextual#destroy(Object, javax.enterprise.context.spi.CreationalContext)}. If this + * {@link jakarta.enterprise.context.spi.Contextual#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}. If + * this * is a CDI contextual instance it is also removed from the underlying context. * - * @see AlterableContext#destroy(javax.enterprise.context.spi.Contextual) + * @see AlterableContext#destroy(jakarta.enterprise.context.spi.Contextual) */ default void destroy() { // No-op diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java index 150d9f920ae67..1193f13f74eb6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Lock.java @@ -10,8 +10,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReadWriteLock; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; /** * Defines a concurrency lock for a bean. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Priority.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Priority.java index f45df5e621c23..b07211ebb4127 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Priority.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Priority.java @@ -6,11 +6,12 @@ import java.lang.annotation.Target; /** - * This annotation has the same semantics as {@link javax.annotation.Priority} except that the {@link Target} meta-annotation is + * This annotation has the same semantics as {@link jakarta.annotation.Priority} except that the {@link Target} meta-annotation + * is * not present. The main motivation is to support method and field declarations, i.e. this annotation can be used for producer * methods and fields. Note that this problem is fixed in Common Annotations 2.1. *

    - * A priority specified by {@link AlternativePriority} and {@link javax.annotation.Priority} takes precedence. + * A priority specified by {@link AlternativePriority} and {@link jakarta.annotation.Priority} takes precedence. */ @Retention(RUNTIME) public @interface Priority { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Unremovable.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Unremovable.java index 6bf3548a6be71..510435c10c3a6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Unremovable.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Unremovable.java @@ -17,7 +17,8 @@ *

  • does not have a name,
    • *
  • does not declare an observer,
    • *
  • does not declare any producer which is eligible for injection to any injection point,
    • - *
  • is not directly eligible for injection into any `javax.enterprise.inject.Instance` or `javax.inject.Provider` injection + *
  • is not directly eligible for injection into any `jakarta.enterprise.inject.Instance` or `jakarta.inject.Provider` + * injection * point
    • * */ diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java index c89b3feb4114d..57c9abbb2b909 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/WithCaching.java @@ -7,8 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; /** * An injected {@link Instance} annotated with this annotation will cache the result of the {@link Instance#get()} operation. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java index e2d622d84103e..8776486456e15 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractInstanceHandle.java @@ -3,9 +3,9 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.function.Consumer; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; import org.jboss.logging.Logger; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java index 8900d1a0be5be..ab5f585af6523 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java @@ -7,8 +7,8 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.ContextInstanceHandle; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java index 42909774ef55d..2ddd2fb68883f 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ActivateRequestContextInterceptor.java @@ -3,11 +3,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.annotation.Priority; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java index 0754c7bbaf2a2..2bc60e6abc04d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ApplicationContext.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; class ApplicationContext extends AbstractSharedContext { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java index 7efb7ba85eafc..33681ba9b6fee 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java @@ -3,11 +3,11 @@ import java.lang.annotation.Annotation; import java.util.Iterator; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; -import javax.enterprise.inject.spi.CDIProvider; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDIProvider; +import jakarta.enterprise.util.TypeLiteral; import io.quarkus.arc.Arc; @@ -71,6 +71,16 @@ public void destroy(Object instance) { this.instanceDelegate.destroy(instance); } + @Override + public Handle getHandle() { + return this.instanceDelegate.getHandle(); + } + + @Override + public Iterable> handles() { + return this.instanceDelegate.handles(); + } + @Override public Iterator iterator() { return instanceDelegate.iterator(); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java index 3c88386ab5925..803a685d5931d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java @@ -26,28 +26,28 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.context.NormalScope; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Event; -import javax.enterprise.inject.AmbiguousResolutionException; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; -import javax.enterprise.inject.spi.Decorator; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.inject.spi.Interceptor; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Scope; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.context.NormalScope; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.Decorator; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.Interceptor; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Scope; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java index c964fc94642af..c2d76f8b092e9 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AroundInvokeInvocationContext.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.function.Function; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; /** * Special type of InvocationContext for AroundInvoke interceptors. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java index 40a0367b46274..15d44803fd392 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerBean.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.BeanManager; public class BeanManagerBean extends BuiltInBean { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java index 109155c4ced77..e85b713fc55a3 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java @@ -3,43 +3,41 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.spi.Context; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Event; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanAttributes; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.Decorator; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.InjectionTarget; -import javax.enterprise.inject.spi.InjectionTargetFactory; -import javax.enterprise.inject.spi.InterceptionFactory; -import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.inject.spi.Interceptor; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.enterprise.inject.spi.ProducerFactory; -import javax.inject.Qualifier; -import javax.interceptor.InterceptorBinding; +import jakarta.el.ELResolver; +import jakarta.el.ExpressionFactory; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanAttributes; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Decorator; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InjectionTargetFactory; +import jakarta.enterprise.inject.spi.InterceptionFactory; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.Interceptor; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.inject.spi.ProducerFactory; +import jakarta.inject.Qualifier; +import jakarta.interceptor.InterceptorBinding; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; @@ -121,14 +119,6 @@ public void validate(InjectionPoint injectionPoint) { throw new UnsupportedOperationException(); } - // Deprecated method which can be safely removed once we use CDI 4.0+ - @Deprecated - public void fireEvent(Object event, Annotation... qualifiers) { - Set eventQualifiers = new HashSet<>(); - Collections.addAll(eventQualifiers, qualifiers); - new EventImpl(event.getClass(), eventQualifiers).fire(event); - } - @Override public Set> resolveObserverMethods(T event, Annotation... qualifiers) { Type eventType = Types.getCanonicalType(event.getClass()); @@ -242,12 +232,6 @@ public AnnotatedType createAnnotatedType(Class type) { throw new UnsupportedOperationException(); } - // Deprecated method which can be safely removed once we use CDI 4.0+ - @Deprecated - public InjectionTarget createInjectionTarget(AnnotatedType type) { - throw new UnsupportedOperationException(); - } - @Override public InjectionTargetFactory getInjectionTargetFactory(AnnotatedType annotatedType) { throw new UnsupportedOperationException(); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java index e2adf206ca47c..291c3294b9ed8 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerProvider.java @@ -1,7 +1,7 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.BeanManager; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java index e1004fec2bbf6..0907a676efebc 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanMetadataProvider.java @@ -1,7 +1,7 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java index 91db032697dbf..782f1b9558c47 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BuiltInBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java index 85bcd64f9e4e0..8a2417950e416 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.spi.Contextual; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java index 97e7e91cfab90..07ad96d54928e 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextDataMap.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.Set; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java index 88c3ab4a1a641..fcfce31cbe023 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ContextInstanceHandleImpl.java @@ -1,6 +1,6 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.ContextInstanceHandle; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java index 33cae5c4955fd..af2567c577b9c 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Contexts.java @@ -9,9 +9,9 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Singleton; import io.quarkus.arc.InjectableContext; import io.quarkus.arc.ManagedContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java index 4da18083d7191..95bf2714e7ec4 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.function.Function; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java index 2f21bbd7ab532..3ee2809f5504a 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java @@ -14,16 +14,16 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedCallable; -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedCallable; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java index 3afe7668e5178..d7ef2fede1a11 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DecoratorDelegateProvider.java @@ -1,6 +1,6 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java index e72d314832720..c1f983e284d4d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/DefaultAsyncObserverExceptionHandler.java @@ -1,8 +1,8 @@ package io.quarkus.arc.impl; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.inject.Singleton; import org.jboss.logging.Logger; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java index e80cd5c1c7671..1ba2cf08159a6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EagerInstanceHandle.java @@ -2,7 +2,7 @@ import java.util.function.Consumer; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InstanceHandle; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java index 5da32f79160cc..c2b970db440fd 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventBean.java @@ -3,9 +3,9 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Event; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.spi.InjectionPoint; public class EventBean extends BuiltInBean> { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java index 3a428d799dc54..71dbb4d24d316 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java @@ -2,7 +2,7 @@ import static io.quarkus.arc.impl.TypeCachePollutionUtils.asParameterizedType; import static io.quarkus.arc.impl.TypeCachePollutionUtils.isParameterizedType; -import static javax.transaction.Status.STATUS_COMMITTED; +import static jakarta.transaction.Status.STATUS_COMMITTED; import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; @@ -22,20 +22,20 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.enterprise.event.Event; -import javax.enterprise.event.NotificationOptions; -import javax.enterprise.event.ObserverException; -import javax.enterprise.event.TransactionPhase; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.EventMetadata; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.enterprise.util.TypeLiteral; -import javax.transaction.RollbackException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.NotificationOptions; +import jakarta.enterprise.event.ObserverException; +import jakarta.enterprise.event.TransactionPhase; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.EventMetadata; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; import org.jboss.logging.Logger; @@ -260,7 +260,7 @@ void notify(T event, ObserverExceptionHandler exceptionHandler, boolean async) { try { if (transactionManagerInstance.isAvailable() && - transactionManagerInstance.get().getStatus() == javax.transaction.Status.STATUS_ACTIVE) { + transactionManagerInstance.get().getStatus() == jakarta.transaction.Status.STATUS_ACTIVE) { // we have one or more transactional OM, and TransactionManager is available // we attempt to register a JTA synchronization List> deferredEvents = new ArrayList<>(); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java index 12baf664ebef4..e120ab942c0f7 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventProvider.java @@ -4,8 +4,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Event; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Event; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java index 943906717f41a..a33bb2297bf24 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Identified.java @@ -9,8 +9,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; /** * Qualifies a bean with a string-based identifier. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java index 3832d54401daa..d6efa8b906401 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InitializedInterceptor.java @@ -4,9 +4,9 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.InterceptionType; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.InjectableInterceptor; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java index 4aca922bb5413..92ead3eba3fad 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableReferenceProviders.java @@ -1,7 +1,7 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java index de041f88a6161..b7898b5ee36c6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectableRequestContextController.java @@ -2,10 +2,10 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.control.RequestContextController; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.control.RequestContextController; import io.quarkus.arc.Arc; import io.quarkus.arc.ManagedContext; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java index 9aaee5f64a9e9..f65fce52d758d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointBean.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.InjectionPoint; public class InjectionPointBean extends BuiltInBean { private static final Set IP_TYPES = Set.of(InjectionPoint.class, Object.class); diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java index 08593713425e3..5dd28847b94b0 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InjectionPointProvider.java @@ -1,7 +1,7 @@ package io.quarkus.arc.impl; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.InjectionPoint; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java index bbe1bab5b4923..16636137605ef 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceBean.java @@ -4,9 +4,9 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.InjectionPoint; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java index 4572094edfc6d..8e9d7d3f9df2d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceImpl.java @@ -16,14 +16,14 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.AmbiguousResolutionException; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import io.quarkus.arc.Arc; import io.quarkus.arc.ClientProxy; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java index 51cde16792933..013472e61ead4 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InstanceProvider.java @@ -5,8 +5,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Instance; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java index 4e548bc65e8a4..afff1078bd8fa 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Instances.java @@ -10,9 +10,9 @@ import java.util.Set; import java.util.function.Supplier; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.InjectionPoint; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InstanceHandle; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java index 2419db6af3fe7..1b919ce10860d 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedBeanMetadataProvider.java @@ -2,10 +2,10 @@ import static io.quarkus.arc.impl.CreationalContextImpl.unwrap; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Intercepted; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Intercepted; +import jakarta.enterprise.inject.spi.Bean; import io.quarkus.arc.InjectableReferenceProvider; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java index 2bf04c1c85a7d..80c51464ecc36 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptedStaticMethods.java @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; public final class InterceptedStaticMethods { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java index 3c8e235ac0434..8f26e8a734a51 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InterceptorInvocation.java @@ -1,7 +1,7 @@ package io.quarkus.arc.impl; -import javax.enterprise.inject.spi.InterceptionType; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.InjectableInterceptor; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java index ef3c639431455..5132867850d2f 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/InvocationContexts.java @@ -8,7 +8,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.InvocationContext; public final class InvocationContexts { @@ -62,7 +62,7 @@ public static InvocationContext preDestroy(Object target, List constructor, Object[] parameters, diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java index 8c13e17465647..891a1c8397257 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LazyInstanceHandle.java @@ -3,7 +3,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableBean; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java index 00a1289f3d778..46f94cb31cbd6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/LockInterceptor.java @@ -1,16 +1,16 @@ package io.quarkus.arc.impl; -import static javax.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; import java.lang.annotation.Annotation; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.ArcInvocationContext; import io.quarkus.arc.Lock; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java index 216ed66668235..0c4dea580e2fb 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java @@ -12,9 +12,9 @@ import java.util.Set; import java.util.function.BiFunction; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.util.Nonbinding; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.util.Nonbinding; public final class Qualifiers { diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Reflections.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Reflections.java index 804d48862b104..79777725506d1 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Reflections.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Reflections.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.function.Function; -import javax.enterprise.inject.CreationException; +import jakarta.enterprise.inject.CreationException; /** * Neither the class nor its methods are considered a public API and should only be used internally. diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java index 2f9eb74464027..d0fef6b23ac76 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java @@ -11,10 +11,10 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; import org.jboss.logging.Logger; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java index fe4a43f64102f..59a95f86cdec6 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ResourceProvider.java @@ -4,7 +4,7 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import io.quarkus.arc.InjectableReferenceProvider; import io.quarkus.arc.InstanceHandle; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java index 2ee8f46e75cdb..549ebed4de469 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/SingletonContext.java @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.ContextInstanceHandle; import io.quarkus.arc.InstanceHandle; diff --git a/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java b/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java index d6fb4ed39ccde..15c1877c9b89c 100644 --- a/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java +++ b/independent-projects/arc/runtime/src/test/java/io/quarkus/arc/impl/QualifiersTest.java @@ -7,8 +7,8 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.context.Initialized; -import javax.enterprise.inject.Any; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.inject.Any; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java index 5cfae8d773450..7d982d17d20b2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/MyQualifier.java @@ -10,7 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Inherited diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java index ad7b744462acf..c1aa07e80d6a9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/all/ListAllTest.java @@ -8,13 +8,13 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java index 439bd1f22ff1a..a0eb8fa92b308 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesPriorityTest.java @@ -4,12 +4,12 @@ import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java index c9ecc8a39bc2f..b3200e456337b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/AlternativesTest.java @@ -4,11 +4,11 @@ import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java index 9f77a29cc040b..d8c6b6661b2ce 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityAnnotationTest.java @@ -3,14 +3,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.CDI; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java index 89ad409155918..c46a10fc9b37f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativePriorityResolutionTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Vetoed; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Vetoed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativeProducerPriorityOnClassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativeProducerPriorityOnClassTest.java index 298d1a508aa2a..bbc911fec62de 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativeProducerPriorityOnClassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/AlternativeProducerPriorityOnClassTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java index e5b76406f782a..469b5b5e8f02e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/alternatives/priority/ComputedAlternativePriorityTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; import org.jboss.jandex.AnnotationTarget; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/create/BeanCreateErrorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/create/BeanCreateErrorTest.java index 57c04fbc7fc79..9f553a8e7d1ce 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/create/BeanCreateErrorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/create/BeanCreateErrorTest.java @@ -6,10 +6,10 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.CreationException; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.CreationException; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java index b9f8f1a2e68eb..a5e920e92e433 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/destroy/BeanPreDestroyErrorTest.java @@ -4,11 +4,11 @@ import java.math.BigDecimal; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java index 7083606fe3134..c319715f6ce55 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Bird.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; // base class defining pre destroy and post construct callbacks @Dependent diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java index 50fc34985e981..7bb8efbf32d34 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Eagle.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; @Dependent public class Eagle extends Bird { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java index a38ddb19b7623..7c2be21d2fcb8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/lifecycle/inheritance/Falcon.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; // extends Bird class, overrides pre-destroy and post construct with new variant @Dependent diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/ArrayBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/ArrayBeanTypesTest.java index 90d3ae1b2b2fb..d72f17eff7625 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/ArrayBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/ArrayBeanTypesTest.java @@ -7,11 +7,11 @@ import java.util.List; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java index aeff5ab1f0c12..0e004b19e854a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/EnumBeanTypesTest.java @@ -8,8 +8,8 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java index 8af418de89d42..6cab554a20207 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/GenericBeanTypesTest.java @@ -9,10 +9,10 @@ import java.util.Iterator; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/NonPublicJdkBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/NonPublicJdkBeanTypesTest.java index 3b42d0bb969dd..75d31e87ddeb6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/NonPublicJdkBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/NonPublicJdkBeanTypesTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatCollection; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java index 99a38c1b8bc88..30459f86c1825 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/bean/types/SimpleBeanTypesTest.java @@ -7,7 +7,7 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java index f8fc7df3dd819..4a5ebc5d84a54 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerEventTest.java @@ -4,9 +4,9 @@ import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java index f4b3fd716a5ba..4e922b69e25d9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerInstanceTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java index 76bbbb4b145cd..388f1de936bab 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java @@ -25,32 +25,32 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.util.Nonbinding; -import javax.inject.Inject; -import javax.inject.Qualifier; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; @@ -173,7 +173,7 @@ public Annotated getAnnotated() { @Test public void testResolveInterceptors() { BeanManager beanManager = Arc.container().beanManager(); - List> interceptors; + List> interceptors; // InterceptionType does not match interceptors = beanManager.resolveInterceptors(InterceptionType.AROUND_CONSTRUCT, new DummyBinding.Literal(true, true)); assertTrue(interceptors.isEmpty()); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java index fb9b13e9dd36a..67fc97c3f8995 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AddObservesTest.java @@ -4,8 +4,8 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget.Kind; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java index f91f70145ff7c..b169c328552f8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerBuilderTest.java @@ -6,10 +6,10 @@ import java.util.AbstractList; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Vetoed; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Vetoed; +import jakarta.inject.Inject; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.PrimitiveType; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java index 90ca921ede1b6..471f353d809e1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerInterceptorBindingTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import org.jboss.jandex.AnnotationTarget.Kind; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java index af93afe9d97f2..56d5cc8788669 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/AnnotationsTransformerTest.java @@ -7,9 +7,9 @@ import java.util.AbstractList; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Vetoed; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Vetoed; +import jakarta.inject.Inject; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java index dca55da5eec8e..8d2dfbb0263ad 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/SimpleInterceptor.java index f4e5dbc82e265..9b4c84795993c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/annotations/SimpleInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.buildextension.annotations; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java index 3f58e841dc2a9..30c2eb26896ab 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java @@ -16,13 +16,13 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; import org.jboss.jandex.ParameterizedType; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/NormalScopedSyntheticBeanProducedNullTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/NormalScopedSyntheticBeanProducedNullTest.java index 7814f10472cc3..8a7ef3ce593ff 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/NormalScopedSyntheticBeanProducedNullTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/NormalScopedSyntheticBeanProducedNullTest.java @@ -5,9 +5,9 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.CreationException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.CreationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java index c6cbed652feff..4e191f0803969 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SynthBeanWithWrongScopeTest.java @@ -12,7 +12,7 @@ import java.lang.annotation.Target; import java.util.Map; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java index df7ccbb20bc34..f2ae8ff9fec52 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java @@ -5,7 +5,7 @@ import java.util.Map; -import javax.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.context.spi.CreationalContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java index f5f4d3007a521..b194d77b2279f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanWithStereotypeTest.java @@ -13,13 +13,13 @@ import java.lang.annotation.Target; import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java index 916116c2bdbd8..807773e9b7948 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/injectionPoints/InjectionPointTransformerTest.java @@ -12,12 +12,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java index 290138a2439a5..94ed03419b5cd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsPredicateTest.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java index afdf7fa298bda..eac99bd810bc4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/interceptor/bindings/AdditionalInterceptorBindingsTest.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java index b69e2e0900930..404c4eacaa2fe 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/observers/SyntheticObserverTest.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.literal.NamedLiteral; -import javax.enterprise.inject.spi.EventContext; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java index 0214d05226687..25bfbf0f2ad67 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java @@ -16,8 +16,8 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Singleton; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Singleton; import org.jboss.jandex.DotName; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java index 90ea7e0dade6e..42773d615a868 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/stereotypes/AdditionalStereotypesTest.java @@ -13,14 +13,14 @@ import java.lang.annotation.Target; import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Named; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Named; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java index 8f62965d29e08..44b5407a80a7f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/validator/BeanDeploymentValidatorTest.java @@ -10,13 +10,13 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.jboss.jandex.DotName; import org.jboss.jandex.ParameterizedType; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java index 043acb8a25bd8..e8699bb265c60 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/BuiltInBeansAreResolvableTest.java @@ -13,18 +13,18 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Qualifier; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java index 7c89169b8238a..90f6bd3ced077 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/builtin/beans/InjectionPointBuiltInBeanTest.java @@ -5,14 +5,14 @@ import java.lang.reflect.Executable; import java.lang.reflect.Field; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java index 1e2e92919dba6..795019cfd9725 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/cdiprovider/CDIProviderTest.java @@ -7,10 +7,10 @@ import java.lang.reflect.Field; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.CDI; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java index 30115de9e5ca8..b5442ead8ff56 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/CircularDependenciesChainTest.java @@ -5,9 +5,9 @@ import java.util.Comparator; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java index 00032c3bfd1c7..79663235b705c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/circular/SelfInjectionWithNormalScopeTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java index 88dd50a71beae..ea74bcdd13ef4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ClientProxyGetContextualInstanceTest.java @@ -5,8 +5,8 @@ import java.io.IOException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java index 88f61b9127d6e..9bdadfffae9b9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/ProducerClientProxyTest.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.util.function.Function; -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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java index 849a5e8789d1d..975786c0635b5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/Complex.java @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Qualifier @Inherited diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java index 8f55cbc65bfc8..88e7a8042dad6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/bridgemethod/SameDescriptorDifferentReturnTypeMethodTest.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.io.Serializable; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java index f2e990eacbf1f..e5ca6a104cee7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ClientProxyConstructorGuardTest.java @@ -5,7 +5,7 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java index 459aa47e727bb..d56d56889a5e2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/constructor/ProducerReturnTypePackagePrivateNoArgsConstructorTest.java @@ -6,9 +6,9 @@ import java.io.IOException; -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.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java index 73c0fd33acf29..c550f22d96690 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/contextnotactive/ClientProxyContextNotActiveTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.RequestScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java index e4fa3009cede6..c05df5fdea061 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/delegatingmethods/MyBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.clientproxy.delegatingmethods; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyBean extends Component implements HasSize { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java index 9dcf7e185ee1e..fc92af74df0b8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/finalmethod/FinalMethodIgnoredTest.java @@ -5,8 +5,8 @@ import java.io.IOException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/packageprivate/foo/Producer.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/packageprivate/foo/Producer.java index 3301df337c4c8..b5f689fae6df5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/packageprivate/foo/Producer.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/packageprivate/foo/Producer.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.clientproxy.packageprivate.foo; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; @ApplicationScoped public class Producer { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/Foo.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/Foo.java index 7aa3dbfdeb523..54f3868e0d96d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/Foo.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/clientproxy/toString/Foo.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.clientproxy.toString; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Foo { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java index 1120dd4ad0be9..0c2e2b4c9fe58 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationContextGetTest.java @@ -6,8 +6,8 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java index 4b2caa89329e3..228c035712aeb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/application/ApplicationInitializedTest.java @@ -4,12 +4,12 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java index fc2f66cae7888..7318e58b19c02 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/dependent/DependentCreationalContextTest.java @@ -6,12 +6,12 @@ import java.util.Map; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ContextObserver.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ContextObserver.java index 10981ccdd8cc1..dc72378d02d4f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ContextObserver.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ContextObserver.java @@ -1,11 +1,11 @@ package io.quarkus.arc.test.contexts.request; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class ContextObserver { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java index 7c047d64b6d6c..c773bf79a3b1b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/Controller.java @@ -3,9 +3,9 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class Controller { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ControllerClient.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ControllerClient.java index e94ba36e7a9e9..2504c2c7dc800 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ControllerClient.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/ControllerClient.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.contexts.request; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; @ApplicationScoped public class ControllerClient { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java index 531d260650a9c..7b3fd5f2764bc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/RequestContextTest.java @@ -7,9 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.control.RequestContextController; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.control.RequestContextController; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java index 510e694bd7af8..2af0a3460300b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/ActivateRequestContextInterceptorTest.java @@ -10,13 +10,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java index b3f956f1dc978..bab8a04132bd9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/RequestContextPropagationTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.ContextNotActiveException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java index 596fa7bee0b19..e34210b32246e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperButton.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; @Dependent public class SuperButton { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java index c0a6c7784dbb1..37de6bb700ed1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/SuperController.java @@ -3,10 +3,10 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; @RequestScoped public class SuperController { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java index 9dcc23499c207..e0e2b2052adaa 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/request/propagation/YetAnotherReqScopedBean.java @@ -2,7 +2,7 @@ import java.util.Random; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class YetAnotherReqScopedBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java index 32aea5c47de88..e0086a6bb9221 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonContextGetTest.java @@ -6,8 +6,8 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java index 8873adb8a94c1..780fcd32beea0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/contexts/singleton/SingletonDestructionTest.java @@ -4,10 +4,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorOverloadingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorOverloadingTest.java index cd66ec68ebebf..1a48b01c8fe9c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorOverloadingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorOverloadingTest.java @@ -2,12 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java index 55ce203ca4a2a..47d02b42821cc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/SimpleDecoratorTest.java @@ -2,12 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java index 3ec64820c0915..74f02cddf0a56 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/AbstractDecoratorTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java index c8885ba668aa9..091f8d906b09a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/abstractimpl/InterceptorAndAbstractDecoratorTest.java @@ -10,15 +10,15 @@ import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java index b666e4e94de53..0d751266fb700 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/delegate/DelegateSubtypeTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java index e9d48318daf6e..809c698cd9d75 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/DecoratorWithTypeVariableTest.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Set; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public void testDecoration() { bean.doSomething(new MyParameterizedType<>("test", new Contract()))); // Secondly, assert that this decorator can be resolved at runtime via BM - List> decoratorsFound = Arc.container().beanManager() + List> decoratorsFound = Arc.container().beanManager() .resolveDecorators(Set.of(new TypeLiteral>() { }.getType()), Any.Literal.INSTANCE); Assertions.assertTrue(decoratorsFound.size() == 1); diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java index b05d965a78ab4..cf43fb5261409 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/generics/GenericsDecoratorTest.java @@ -5,11 +5,11 @@ import java.util.List; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java index ffbcaf8e053eb..0ac83d0e9c507 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/interceptor/InterceptorAndDecoratorTest.java @@ -10,15 +10,15 @@ import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlphaConverterDecorator.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlphaConverterDecorator.java index f1e2c0c9e73cc..cb46dbddf4dbf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlphaConverterDecorator.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlphaConverterDecorator.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.decorators.priority; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.inject.Inject; @Priority(20) @Decorator diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlsoAlphaConverterDecorator.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlsoAlphaConverterDecorator.java index f68ee91ed6d09..6bae6ffb75751 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlsoAlphaConverterDecorator.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/AlsoAlphaConverterDecorator.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.decorators.priority; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.inject.Inject; @Priority(20) @Decorator diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java index a2fdd18d47292..d7b9d81ac2834 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/BravoConverterDecorator.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.decorators.priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.inject.Inject; import io.quarkus.arc.Priority; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java index b88f28aa2d555..e0b235c7e3a4f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsSamePriorityTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java index cae321ede26da..2e8462cbe952b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/priority/MultipleDecoratorsTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java index a8c17d4a17480..140592973689c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/qualifiers/DelegateQualifiersTest.java @@ -2,13 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java index 4808722aaefaf..7951757a334ff 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/AbstractDecoratorWithAbstractMethodTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java index 6716eb2ca48c6..bf433785622d6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DecoratorForBuiltInEventTypeTest.java @@ -6,12 +6,12 @@ import java.lang.annotation.Annotation; import java.util.concurrent.CompletionStage; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.event.Event; -import javax.enterprise.event.NotificationOptions; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.NotificationOptions; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java index 5b6fffd985965..dce18c6049100 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/DelegateDoesNotImplementDecoratedTypeTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java index 0001f187e13a9..5123dd61ca3c1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/MultipleDelegateInjectionPointsTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java index 8547756c23c30..2c11ccee59e27 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDecoratedTypeTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java index e7fb0cdaa2b7f..25ac56397907d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NoDelegateInjectionPointTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.decorator.Decorator; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java index d7873e19a27ff..f037b2ccaf1ea 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/decorators/validation/NonDependentScopeTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -26,7 +26,7 @@ public void testFailure() { assertTrue( container.getFailure().getMessage() .contains( - "A decorator must be @Dependent but io.quarkus.arc.test.decorators.validation.NonDependentScopeTest$DecoratorWithWrongScope declares javax.enterprise.context.ApplicationScoped"), + "A decorator must be @Dependent but io.quarkus.arc.test.decorators.validation.NonDependentScopeTest$DecoratorWithWrongScope declares jakarta.enterprise.context.ApplicationScoped"), container.getFailure().getMessage()); } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java index 156ea33c02ba2..3d889eda4bb72 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultClassBeanTest.java @@ -5,12 +5,12 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java index 9cf0c82e93004..b9102a8319f35 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerFieldTest.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java index df27a01a0099e..f7dd994f5648d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/defaultbean/DefaultProducerMethodTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java index e30d6ef1c392e..9fd86554a069d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/AbstractClassIgnoredTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java index 71f6da5da3ca3..790364cc5eb58 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/discovery/ParameterizedBeanTypeWithVariableTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java index 381db746464f4..ea57b56d9ed74 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/EventSelectTest.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.event.select; -import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.TypeLiteral; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SecuritySensor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SecuritySensor.java index 91584749e7798..67599bfc132c5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SecuritySensor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SecuritySensor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.event.select; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.inject.Any; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.inject.Any; +import jakarta.inject.Inject; @Dependent public class SecuritySensor { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java index fbf3f5a23e0ad..2d76a6b5b1a18 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/event/select/SystemTest.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java index c28c446096e0f..e88364dba62fc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java index 523d99f1474b6..90f58022eb581 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java @@ -12,15 +12,15 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java index cd2b49b50d6f2..29542c1f64f12 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/QualifiersInheritanceTest.java @@ -7,9 +7,9 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java index 30855b3cdd955..f754c0360f327 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceStereotypeTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Model; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Model; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java index cfaf38dee9d4e..02081cf81065b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/ScopeInheritanceTest.java @@ -11,11 +11,11 @@ import java.lang.annotation.Target; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java index 0823a715fcef2..c21696214f73f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java @@ -13,16 +13,16 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.Typed; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java index 54f17fa3609db..403f2141eb302 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/ListJdkElementTypeTest.java @@ -5,10 +5,10 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java index a124e1d65a47b..83958b372841f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/OptionalAssignabilityTest.java @@ -4,11 +4,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java index 732f252628d41..df550b7215808 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/AssignabilityWithGenericsTest.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.event.ObservesAsync; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Car.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Car.java index 0cc0985ae56ba..f7cd4d299fc1a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Car.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Car.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.injection.assignability.generics; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Car extends Vehicle { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/PetrolEngine.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/PetrolEngine.java index 0a486c318ad29..d235a9d5fe602 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/PetrolEngine.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/PetrolEngine.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.injection.assignability.generics; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class PetrolEngine implements Engine { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java index 242c134fa7f20..20d314a54dba2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/RawTypeAssignabilityTest.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.injection.assignability.generics; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Vetoed; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Vetoed; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Vehicle.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Vehicle.java index cd468d64132b4..42ed4d1bd311a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Vehicle.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/assignability/generics/Vehicle.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.injection.assignability.generics; -import javax.inject.Inject; +import jakarta.inject.Inject; public abstract class Vehicle { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java index 64a305879f4ca..597d3dcd50d62 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/MultiInjectConstructorFailureTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java index e0d6e4c87a93b..960cb83d30e6b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/NoArgConstructorTakesPrecedenceTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java index 991d98fc546cf..abd180eee515b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/constructornoinject/SingleNonNoArgConstructorInjectionTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java index a03a76ce42641..4e62c34237270 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java @@ -2,8 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java index 791fcd7a4c7a1..8fe60dcd35135 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/finalfield/FinalFieldInjectionTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java index a4f84e6ee71ca..160e2cd720058 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableFieldInjectionPointTest.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java index 7c7e6eab95008..a85ca157e7933 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/illegal/TypeVariableInitializerInjectionPointTest.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java index 99b8a8e7e4d69..b3f7e74c0519b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateconstructor/PrivateConstructorInjectionTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java index 549f02da936e3..db0afe69edf3f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privatefield/PrivateFieldInjectionTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java index a4e6582c0b619..8131907842806 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/privateinitializer/PrivateInitializerInjectionTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java index 2bdb111422d78..ecef3af79b7fa 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/resource/ResourceInjectionTest.java @@ -16,25 +16,25 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.metamodel.Metamodel; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.metamodel.Metamodel; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java index ab70d2a846955..93fecc88b5987 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/staticfield/StaticFieldInjectionTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java index b9f8dd4431447..0422cee08c28d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java @@ -8,11 +8,11 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java index a45db78a3de81..9f28f1366a4eb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/foo/FooHarvester.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.injection.superclass.foo; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.arc.test.injection.superclass.SuperclassInjectionTest.Head; import io.quarkus.arc.test.injection.superclass.SuperclassInjectionTest.SuperHarvester; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java index fd64da3df0482..931a817f48386 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/ArcContainerSelectTest.java @@ -12,15 +12,15 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.util.AnnotationLiteral; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java index 60ee66907cd98..48d384a6c7cf5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InjectableInstanceTest.java @@ -7,12 +7,12 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java index 13faed49a5d70..3afac81413791 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/InvalidQualifierInstanceTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import javax.enterprise.inject.Instance; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java index 310db680932e9..a4f19ee638cda 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/PriorityTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,7 +35,7 @@ interface Converter { } - @javax.annotation.Priority(5) // this priority takes precedence + @jakarta.annotation.Priority(5) // this priority takes precedence @Priority(50) @Singleton static class AlphaConverter implements Converter { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java index d6923687706e7..8f9741562ce20 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/RawTypeInstanceTest.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java index c719155148340..2f54f30b963f9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/cacheget/InstanceWithCachingTest.java @@ -6,12 +6,12 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java index 97ce20addbc88..1c89c3ed5470b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/destroy/InstanceDestroyTest.java @@ -7,13 +7,13 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java index fe3f2566b9cb4..53f42413f39f3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/frombean/InstanceFromBeanTest.java @@ -4,8 +4,8 @@ import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java index b01573a6e3684..14e5e56443a94 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/TypeVariableInstanceInjectionPointTest.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +25,7 @@ public void testError() { assertNotNull(failure); assertTrue(failure instanceof DefinitionException); assertEquals( - "Type variable is not a legal type argument for javax.enterprise.inject.Instance: io.quarkus.arc.test.instance.illegal.TypeVariableInstanceInjectionPointTest$Head#instance", + "Type variable is not a legal type argument for jakarta.enterprise.inject.Instance: io.quarkus.arc.test.instance.illegal.TypeVariableInstanceInjectionPointTest$Head#instance", failure.getMessage()); } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java index 4ead3ec2fb9b4..307b7c2bfeb35 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/instance/illegal/WildcardInstanceInjectionPointTest.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -25,7 +25,7 @@ public void testError() { assertNotNull(failure); assertTrue(failure instanceof DefinitionException); assertEquals( - "Wildcard is not a legal type argument for javax.enterprise.inject.Instance: io.quarkus.arc.test.instance.illegal.WildcardInstanceInjectionPointTest$Head#instance", + "Wildcard is not a legal type argument for jakarta.enterprise.inject.Instance: io.quarkus.arc.test.instance.illegal.WildcardInstanceInjectionPointTest$Head#instance", failure.getMessage()); } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java index 3c7d11a47265d..93d861e13ed98 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class Counter { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java index 34bf64effb821..bcc5eb87e519a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/KotlinInterceptorTest.java @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java index 12f8809470e5d..3eff459de66c3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Lifecycle.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java index ac92863f1921a..3cf327c15a577 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LifecycleInterceptor.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java index 2b5ec678af827..073b553cc0faa 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Logging.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java index 5a8678bed552c..beed992aaa943 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/LoggingInterceptor.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicReference; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.Priority; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java index c821dc26953a4..c524aaa3b7389 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleBean.java index b7ccff5af421f..3bade240cfb9a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.interceptors; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @Lifecycle @Dependent diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java index 3f0dc7e8766a1..3e452cc2bc41d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/SimpleInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptors; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java index 84b6fdaa4edee..82ca70a9cd066 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptor.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java index 58461b193a866..5d8428c6ad7be 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextInterceptorPrivate.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java index 2e2751c127851..c0aead235948c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptor.java @@ -3,10 +3,10 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.interceptor.Interceptor; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.interceptor.Interceptor; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java index 64c67ac849d40..2fed150246350 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/ArcContextLifecycleInterceptorPrivate.java @@ -3,10 +3,10 @@ import java.lang.annotation.Annotation; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.interceptor.Interceptor; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.interceptor.Interceptor; import io.quarkus.arc.ArcInvocationContext; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/Foo.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/Foo.java index 0e2e34e9a7714..f2dc0571bf72a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/Foo.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/Foo.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.arcInvContext; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @SomeBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java index ea9c665ce82a1..6c4811bb090d6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/arcInvContext/SomeBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java index c2741cdb809e4..8f3d25a6772fd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructAppliedViaConstructorTest.java @@ -5,12 +5,12 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.AroundConstruct; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java index 0d0409d87d06d..9c0667905e718 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructReturningObjectTest.java @@ -5,10 +5,10 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Singleton; -import javax.interceptor.AroundConstruct; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java index 396fda6f582e3..fc3f8c7d016b9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/AroundConstructTest.java @@ -6,12 +6,12 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java index ef549a960f6e0..659e628154a36 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyOtherTransactional.java @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java index f7a514caeb549..e74f257fb5ef5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/aroundconstruct/MyTransactional.java @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java index 8b9e2eb705fe9..9b594112c3555 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/BindingDefaultValueTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java index 372ca48cea8e6..a2db094843314 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindingdefaultvalue/MyTransactional.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java index 0e4e0e86ff984..93ce0f3c24db7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/InvocationContextBindingsTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java index a4badc71535c6..2f1e8a5952247 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/MyTransactional.java @@ -8,8 +8,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java index 5f80e77947f20..364294759cbf2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/BarBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Documented diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java index 57096cc8b362d..73b709eed859f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/FooBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Documented diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyBean.java index 04c27aa33f6b4..9f15edfa653a7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.multiple; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @BarBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyInterceptor.java index b198347415661..19469829c7c0a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.bindings.multiple; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyOtherBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyOtherBean.java index 0260085b8e011..5e8861c921609 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyOtherBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/multiple/MyOtherBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.multiple; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @FooBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java index 21d72b07fa20d..92fabb99e414a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java @@ -11,14 +11,14 @@ import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java index 217d3df90fb50..45c5b3ccf77b0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java @@ -11,14 +11,14 @@ import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java index 114e26d0a805c..f70bbd0925c4d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java @@ -11,15 +11,15 @@ import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InterceptorBinding; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InterceptorBinding; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java index 8bc648e20e8df..634f1bf4f8a7f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/AnotherAnnotation.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/ClassLevelInterceptedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/ClassLevelInterceptedBean.java index 75b4a6dc7f4fc..fb5056ec58bde 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/ClassLevelInterceptedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/ClassLevelInterceptedBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @SomeAnnotation diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java index d99390a56fb01..2be78fb9597c0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterInterceptor.java index 54ccf2ebab25c..fc89b4acb2ecb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/CounterInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/MethodLevelInterceptedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/MethodLevelInterceptedBean.java index 5b81b3cd05f66..4caeca9c274b2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/MethodLevelInterceptedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/MethodLevelInterceptedBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MethodLevelInterceptedBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/NotInterceptedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/NotInterceptedBean.java index 6cae4e809af9a..c69a1180c7612 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/NotInterceptedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/NotInterceptedBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @NotABinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java index d357426257f56..b8ce4d9655d14 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/SomeAnnotation.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; /** * This annotation is a not a binding itself but a meta-annotation containing one. diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveCounterInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveCounterInterceptor.java index e05e4c10d9726..2aff42936aaa1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveCounterInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TransitiveCounterInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(2) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TwoLevelsDeepClassLevelInterceptedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TwoLevelsDeepClassLevelInterceptedBean.java index 395b8b43845b3..6751c1007f5e9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TwoLevelsDeepClassLevelInterceptedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/TwoLevelsDeepClassLevelInterceptedBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.transitive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @AnotherAnnotation diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/DummyBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/DummyBean.java index 34e110b2120a3..95a3178ff272c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/DummyBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/DummyBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.bindings.transitive.with.transformer; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @PlainBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java index ab1de49529aa8..51d14ef595f41 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerInterceptor.java index baba66ef8cb7f..30e0819254445 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/MuchCoolerInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.bindings.transitive.with.transformer; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java index 404f039d9f4d4..c0530b532148a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainInterceptor.java index c7152eb3dadbf..c92371a7f3c64 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/transitive/with/transformer/PlainInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.bindings.transitive.with.transformer; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java index 4d893c1ca96ff..0f3c706de7f4b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java index 9a70d1a5f4a14..cb2f1fc933d77 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton @Simple diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java index f38aa216c8075..aa2a0a4aede8d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java index e18ae3009f141..40b98b3ef2a15 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptors.bridge; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.test.interceptors.Counter; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java index 23cb0b6f5114d..6a859ed41987e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java index 146799133a0a8..ecf34d0aa52df 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java @@ -2,13 +2,13 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java index ab25290da36b7..a22ff98d1cf5c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Singleton; @Singleton @MyBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java index be86db3ccf54d..b09fde4fdd081 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/constructor/SubclassConstructorGuardTest.java @@ -4,11 +4,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java index 96b732c598b71..b7540167693ee 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/AsyncContinuationTest.java @@ -9,11 +9,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java index 09167a3005a37..3d33001663d5e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/context/ContextDataTest.java @@ -4,11 +4,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java index 010c185973da5..cf50a86e20c0c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/ABinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java index 40e07646c3623..cf000a4cd5132 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.defaultmethod; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ABinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/MessageInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/MessageInterceptor.java index 661fa2b83acb0..08f46b26215fb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/MessageInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/MessageInterceptor.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.interceptors.defaultmethod; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @ABinding @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java index 012c9a1dc6e11..bf271646231fe 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java index 201867f822310..e5ac6e9ce530e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.defaultmethod; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @NextBinding @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingBean.java index 6205fe93924f9..0c8698b4a08b5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.exceptionhandling; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class ExceptionHandlingBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptor.java index 22b634a2a7818..2abd8e86fc2e6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.exceptionhandling; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @ExceptionHandlingInterceptorBinding @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java index 857126aed789f..d30a09f774032 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/exceptionhandling/ExceptionHandlingInterceptorBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java index 3e6f9f8d160a1..f9a491360ca8f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalInterceptedMethodTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.Priority; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java index 799739fb29310..4defa4c15011b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/finalmethod/FinalNonInterceptedMethodTest.java @@ -2,12 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java index 38add15da746d..50c7b2fe37209 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.interceptors.inheritance; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @One @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java index 9d234aece3464..2a1528a44533f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.inheritance; -import javax.interceptor.Interceptor; +import jakarta.interceptor.Interceptor; @Two @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java index e77f88a535050..fecdc13331593 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java index 4ba511186fe49..444591489ed71 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java index 8a1e03f6c6f81..4e58dcaf02fec 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.interceptors.inheritance; -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.InvocationContext; public class OverridenInterceptor { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java index f5eb942d138b0..582b089dd6673 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java index 0cd7c1751bd14..c205e68816d5f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/InterceptedBeanInjectionTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java index f611d304c081b..237a04b3b5495 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/SimpleInterceptor.java index 9ca7e4de0f456..38e6abd2f489d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/intercepted/SimpleInterceptor.java @@ -1,14 +1,14 @@ package io.quarkus.arc.test.interceptors.intercepted; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.inject.Intercepted; -import javax.enterprise.inject.spi.Bean; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Intercepted; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/LargeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/LargeBean.java index 28bdd5617057e..38772ad0b4b13 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/LargeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/LargeBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.limits; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.test.interceptors.Simple; @@ -6007,4 +6007,4 @@ public String ping1498(String val) { public String ping1499(String val) { return val; } -} \ No newline at end of file +} diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/SubclassLimitsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/SubclassLimitsTest.java index 892d9f2f73b4a..1efb3a79da71c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/SubclassLimitsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/limits/SubclassLimitsTest.java @@ -31,7 +31,7 @@ public void testInterception() { // int count = 1500; // StringBuilder builder = new StringBuilder(); // builder.append("package io.quarkus.arc.test.interceptors.limits;"); - // builder.append("import javax.enterprise.context.ApplicationScoped;"); + // builder.append("import jakarta.enterprise.context.ApplicationScoped;"); // builder.append("import io.quarkus.arc.test.interceptors.Simple;"); // builder.append("@Simple @ApplicationScoped public class LargeBean {"); // for (int i = 0; i < count; i++) { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java index 9a0462fbd3ecf..40451becc0a4c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/CustomExecutor.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.methodargs; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.test.interceptors.methodargs.base.BaseExecutor; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java index fe34a773c7aec..328b3f0f13759 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/ExampleResource.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton @Simple diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java index ef212e7c6703d..3b621af2d36e5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java index 431c8a5c364b4..49c4a052ab446 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/methodargs/SimpleInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptors.methodargs; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.arc.test.interceptors.Counter; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java index ca94707516b71..65e78b849c648 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java @@ -4,13 +4,13 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java index d5db845a4bc19..8c221f521b384 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/AverageBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/AverageBean.java index 285a7a7df81f5..553199cdc70d2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/AverageBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/AverageBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.no.priority; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class AverageBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java index ecd221e13f004..98231fd2419d7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/SimpleInterceptorWithNoPriority.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/SimpleInterceptorWithNoPriority.java index d68260c86e5bd..a94222fd7a172 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/SimpleInterceptorWithNoPriority.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/no/priority/SimpleInterceptorWithNoPriority.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.interceptors.no.priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java index 2e6ce3c65fe62..afb2a8c4168e8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevel.java @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD, CONSTRUCTOR }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevelInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevelInterceptor.java index eaa2925c2661c..da5668caa3f41 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevelInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/ClassLevelInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptors.noclassinterceptors; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @ClassLevel @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java index f48e7e749e329..a844883ff8152 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevel.java @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD, CONSTRUCTOR }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevelInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevelInterceptor.java index 4f1439eb00a10..aeb134c660cde 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevelInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InheritedClassLevelInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptors.noclassinterceptors; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @InheritedClassLevel @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java index 6fea3881b9b82..bbffd543f9131 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/InterceptedBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.noclassinterceptors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.NoClassInterceptors; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java index af6e41314edb0..6b2b2ac1ef5e5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevel.java @@ -9,7 +9,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD, CONSTRUCTOR }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevelInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevelInterceptor.java index 42e6b785a6cca..cd8a0c84a347c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevelInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/noclassinterceptors/MethodLevelInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.interceptors.noclassinterceptors; -import javax.annotation.Priority; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @MethodLevel @Interceptor diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java index 907a91a29adcb..48261ea397dd2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/nonpublicparams/NonPublicParametersTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptor.java index 3363ddbd90111..0182b0ad641cd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/ParamInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.parameters; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java index d057f970f41e0..3715f05244db6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/SimpleBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/SimpleBean.java index e94a82a77fa4e..33a6cd6c9e017 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/SimpleBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/parameters/SimpleBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.interceptors.parameters; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class SimpleBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java index 984b482216912..edab9dd924842 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/privatemethod/PrivateInterceptorMethodTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java index 6efdc252b96dd..31df230cfb0db 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Nok.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/NokInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/NokInterceptor.java index 23bbf830284ed..ce0a84085842b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/NokInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/NokInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.selfinvocation; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Nok @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java index de4f94d5e5568..b15a33c4e3035 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/Ok.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/OkInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/OkInterceptor.java index e78cf8d9170f6..6726dd3e9bab9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/OkInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/OkInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.selfinvocation; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Ok @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java index 02704c633c9e6..c2338640cc0ca 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/selfinvocation/SelfInvocationTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java index b597edce21385..bae0e4c04d8bd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/MyBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java index dc07fcc975d71..9978d047fb356 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/SomeBean.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @MyBinding diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/WeirdInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/WeirdInterceptor.java index 57930a8888955..01d95bd96d59d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/WeirdInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/subclasses/WeirdInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.interceptors.subclasses; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Interceptor @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/OriginalBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/OriginalBean.java index 38341d345c33c..1d1f92c93fdf8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/OriginalBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/OriginalBean.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class OriginalBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/subpackage/AlternativeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/subpackage/AlternativeBean.java index 2829a93657c2f..c903cad0e6074 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/subpackage/AlternativeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lifecyclecallbacks/inherited/subpackage/AlternativeBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.lifecyclecallbacks.inherited.subpackage; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import io.quarkus.arc.test.lifecyclecallbacks.inherited.OriginalBean; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java index e248dc7396a7a..6b4a9f6c1704c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockInterceptorTest.java @@ -15,9 +15,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Singleton; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java index b5824f04e7177..4f00d332354e3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/lock/LockWaitTest.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java index 427a3de2aabcd..022c786ca4390 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/BeanMetadataTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.Bean; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/Controller.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/Controller.java index 65925953c3512..b338989507576 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/Controller.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/Controller.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.metadata; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.Bean; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.inject.Inject; @Dependent public class Controller { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java index 1012f36b0612b..9e72f84e71a2b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/metadata/InjectionPointMetadataTest.java @@ -11,19 +11,19 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java index e65e50366386d..30618eb723d01 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/AmbiguousNameTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/InvalidNamedInjectionPointTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/InvalidNamedInjectionPointTest.java index de39e4dd722a2..5e6cba5a938a4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/InvalidNamedInjectionPointTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/InvalidNamedInjectionPointTest.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java index 0e4ddfac45ae1..6ab64323608fc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.literal.NamedLiteral; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.literal.NamedLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java index 526b23a7fa7ce..c8134a4707eb1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ParameterizedPayloadTest.java @@ -8,12 +8,12 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java index d85238bfa1c36..4c76b018b2650 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/RuntimeClassTest.java @@ -5,12 +5,12 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java index 7c5abc7c7f5e2..c9a6da10accde 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/SimpleObserverTest.java @@ -5,12 +5,12 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java index bfd25ce0043b1..28d9cf0488d68 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverExceptionTest.java @@ -15,13 +15,13 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.ObservesAsync; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java index b30a8ab2f70be..25790f794f593 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/AsyncObserverTest.java @@ -11,14 +11,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.event.ObservesAsync; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java index 9b9409e7d0092..5d624440fd00a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/async/CustomAsyncObserverExceptionHandlerTest.java @@ -11,13 +11,13 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.ObservesAsync; -import javax.enterprise.inject.spi.EventContext; -import javax.enterprise.inject.spi.ObserverMethod; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.enterprise.inject.spi.EventContext; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java index 0c69615622422..2a444578234b6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/discovery/ObserverOnClassWithoutBeanDefiningAnnotationTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java index cec895c3bded8..45391edebb8d0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/BindingTypeA.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java index 25e4974788f62..1b06a4c53e381 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/duplicate/bindings/DuplicateBindingsResolutionTest.java @@ -2,9 +2,9 @@ import java.lang.annotation.Annotation; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ /** * Tests that when you try to resolve observer methods via - * {@link javax.enterprise.inject.spi.BeanManager#resolveObserverMethods(Object, Annotation...)}, + * {@link jakarta.enterprise.inject.spi.BeanManager#resolveObserverMethods(Object, Annotation...)}, * you will get an exception if you pass in twice the same annotation that is not repeatable. */ public class DuplicateBindingsResolutionTest { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java index 143699cdbd6df..ea270b87e83ee 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ifexists/ReceptionIfExistsTest.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.event.Reception; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.event.Reception; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/EmittingBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/EmittingBean.java index 0b6b973e827ba..954c6bbdafc92 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/EmittingBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/EmittingBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.observers.inheritance; -import javax.enterprise.event.Event; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/NonObservingSubBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/NonObservingSubBean.java index 1fa23774c425e..eb5d57d7db765 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/NonObservingSubBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/NonObservingSubBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.observers.inheritance; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java index 7cd9f756fb3c5..cd3eca47b56d8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObserverInheritanceTest.java @@ -4,7 +4,7 @@ import java.lang.annotation.Annotation; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java index 3beb625a943f7..c99cbdd9b4b8a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingBean.java @@ -5,9 +5,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Qualifier; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Qualifier; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingSubBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingSubBean.java index 9cb1cedc12ed4..4dd5c021a58b8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingSubBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/ObservingSubBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.observers.inheritance; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/OriginalBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/OriginalBean.java index ede8d86ac4ddf..44a77b93d0c85 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/OriginalBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/OriginalBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.observers.inheritance.different.packages; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class OriginalBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java index b4a5b83001fdc..b8c457ba49cf1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/different/packages/subpackage/AlternativeBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.observers.inheritance.different.packages.subpackage; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import io.quarkus.arc.test.observers.inheritance.different.packages.OriginalBean; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java index 96886ffdd490a..79776678a50c0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/generated/GeneratedObserverClassNotSharedTest.java @@ -6,10 +6,10 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java index 30390f3bc73a8..78cb788e844e1 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/inheritance/typevariable/ObserverInheritanceTypeVariableTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java index 56483d2a27343..8021aee8041fc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/injection/SimpleObserverInjectionTest.java @@ -8,13 +8,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java index 781270997ce4f..8ff071be8aab9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataTest.java @@ -6,10 +6,10 @@ import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.spi.EventMetadata; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.spi.EventMetadata; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java index e2bef85aebfe2..38cc65e91e126 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/metadata/EventMetadataWrongInjectionTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.spi.DefinitionException; -import javax.enterprise.inject.spi.EventMetadata; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.EventMetadata; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java index cfb1953fb1612..6a548b424b89d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/notification/ObserverNotificationTest.java @@ -4,8 +4,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java index c2a1f9f27e82c..a2ddd3b4ba7c4 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/ordering/ObserverOrderingTest.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java index 2c95cb2182de3..3ad7a8574adf5 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/request/RequestInObserverNotificationTest.java @@ -10,11 +10,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.event.Observes; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java index 8685bf5f02776..ba4bc34d224ae 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/observers/staticmethods/StaticObserverTest.java @@ -9,9 +9,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java index e08b220f5bf45..25bf3c9e1093d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/async/AsyncProducerTest.java @@ -8,10 +8,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java index 20139fff7458e..365d2ed09ce3f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/dependent/DeclaringBeanTest.java @@ -9,11 +9,11 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Singleton; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java index a7880303b6d79..eeeb7bf19f6bf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/discovery/ProducerOnClassWithoutBeanDefiningAnnotationTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java index ba94705131cf0..5d6ecd3ca6d69 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerTest.java @@ -9,15 +9,15 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Singleton; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java index 625cc290f7aac..b45cd3ba79fca 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/DisposerWithWildcardTest.java @@ -8,10 +8,10 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/StaticDisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/StaticDisposerTest.java index 264ce8ab98c7a..bad937661c163 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/StaticDisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/StaticDisposerTest.java @@ -6,11 +6,11 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java index 7e41972dc157f..bc2ac2455a41a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/Claim.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/DuplicateRecursiveGenericTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/DuplicateRecursiveGenericTest.java index 31188eabb78e9..7f08e354c17fb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/DuplicateRecursiveGenericTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/DuplicateRecursiveGenericTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java index fb899125fc465..6e12fec9345b9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/ErasedGenericTest.java @@ -5,12 +5,12 @@ import java.lang.annotation.Annotation; import java.util.Optional; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java index faf086924a312..c94ee3a408928 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/GenericProducerHierarchyTest.java @@ -5,9 +5,9 @@ import java.util.Optional; import java.util.function.Function; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/MutuallyRecursiveGenericTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/MutuallyRecursiveGenericTest.java index 2af37a49e6e71..a1eb3fa93a9a6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/MutuallyRecursiveGenericTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/MutuallyRecursiveGenericTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericInvalidTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericInvalidTest.java index a59453e540b08..b787cd82f9f66 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericInvalidTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericInvalidTest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericTest.java index 29df72f2d3c15..5f1552a7ca87b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/generic/RecursiveGenericTest.java @@ -5,11 +5,11 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java index c55ac3e81fa05..343fbc14cded7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/IllegalProducerTest.java @@ -5,10 +5,10 @@ import java.io.Serializable; import java.time.temporal.Temporal; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.IllegalProductException; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.IllegalProductException; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java index 39a1ef2b985ad..4ffb9285bb217 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java @@ -5,10 +5,10 @@ import java.time.temporal.Temporal; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java index bc762a2193c0f..4f57e02389260 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveProducerTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveWrapperProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveWrapperProducerTest.java index 4987f93f79d0c..088c4c66d2814 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveWrapperProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/primitive/PrimitiveWrapperProducerTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java index dee3671884dac..8b08ae36c271b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerFieldTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java index 92c07219f72b3..b79de8551c2fa 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/privatemember/PrivateProducerMethodTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java index dc959ae0fe887..d8a68b307a4eb 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/staticProducers/StaticMethodProducerTest.java @@ -5,10 +5,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java index 266d953d31741..30986e8f6628c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/Location.java @@ -11,8 +11,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; @Qualifier @Inherited diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java index 922c0f057a507..35ab3d1e42763 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierClassTest.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.qualifiers; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java index 3710b4fa912bf..aca50bdfd3ff0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierObserverTest.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java index 0dbe9dd1bd604..1d49b61d9b454 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/RepeatingQualifierProducerTest.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.qualifiers; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java index 8d54c2259c588..f12dc81fe6e2e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/AnimalQualifier.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Retention(RetentionPolicy.RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Cat.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Cat.java index 63365663fd64b..b4d7050375de2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Cat.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Cat.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.qualifiers.defaultvalues; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent @AnimalQualifier("cat") diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Owl.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Owl.java index 6bd5819732192..25c328bf1cc7e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Owl.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/Owl.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.qualifiers.defaultvalues; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent @AnimalQualifier diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java index 7fabbc0829ef5..6f77cfbe47119 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/qualifiers/defaultvalues/QualifierDefaultValuesTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java index 94995ad1f743a..8cedf873baf52 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/RuntimeResolutionTest.java @@ -7,9 +7,9 @@ import java.util.AbstractList; import java.util.List; -import javax.enterprise.inject.Produces; -import javax.enterprise.util.TypeLiteral; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.util.TypeLiteral; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java index 309e2dd495d5d..42e8056c4b962 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/TypedTest.java @@ -8,11 +8,11 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; -import javax.enterprise.inject.spi.Bean; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedBeanTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedBeanTest.java index 44ecb8b991482..38c62b0d74532 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedBeanTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedBeanTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerFieldTest.java index 5eba9b2987cd8..5242638f6b5f7 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerFieldTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerMethodTest.java index b3710d0ca8337..1156d4101c0c6 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/BrokenTypedProducerMethodTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/FieldProducerBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/FieldProducerBean.java index e065239331c1e..82b17dcbe0b2a 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/FieldProducerBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/FieldProducerBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.resolution.broken; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; @Dependent public class FieldProducerBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MethodProducerBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MethodProducerBean.java index 4ee624d0be656..358dfa937210d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MethodProducerBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MethodProducerBean.java @@ -1,8 +1,8 @@ package io.quarkus.arc.test.resolution.broken; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Typed; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Typed; @Dependent public class MethodProducerBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyBean.java index 6475ab23bf10e..0b9649894a2b0 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyBean.java @@ -1,7 +1,7 @@ package io.quarkus.arc.test.resolution.broken; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Typed; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Typed; @Dependent @Typed(value = MyOtherBean.class) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyOtherBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyOtherBean.java index 3f9907e05e9ed..ebe26f581d7f9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyOtherBean.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/resolution/broken/MyOtherBean.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.resolution.broken; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class MyOtherBean { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java index 2356f7e026d1b..5860f82791fab 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/MultipleStereotypeScopesTest.java @@ -10,10 +10,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Model; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Model; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java index d0032fa9a7587..c9b30f75cbf61 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleBinding.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleInterceptor.java index 05c47fe1afc36..a48c3f7122a77 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/SimpleInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.stereotypes; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @SimpleBinding @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java index 037098c99020f..f29115abf3be3 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeArcPriorityTest.java @@ -11,9 +11,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java index c3d7483d4ddb6..92811a9072bb8 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java @@ -11,10 +11,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Stereotype; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java index 20b772d85ebcd..0615f059d7f78 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java @@ -14,11 +14,11 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java index 8db333459c8af..14d7f05325d03 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java @@ -8,9 +8,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java index a7474a1192a75..5e0f8dbdb340d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeNamedTest.java @@ -7,9 +7,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Stereotype; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java index f9aec4a03e664..c81ee89f736ab 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeOnProducerTest.java @@ -7,10 +7,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Stereotype; -import javax.inject.Named; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java index 052ed0664a0ef..19d55618676cf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeScopeTest.java @@ -5,10 +5,10 @@ import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Model; -import javax.enterprise.inject.Typed; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Model; +import jakarta.enterprise.inject.Typed; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java index b195a02cc4736..2732f9b804f2d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java @@ -13,11 +13,11 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java index a78d8d1b95c80..940ae53da59af 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/transientreference/TransientReferenceDestroyedTest.java @@ -8,16 +8,16 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.TransientReference; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.TransientReference; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java index 62c4030d78082..8d2dd5e3ab5cf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Alpha.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/AlphaInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/AlphaInterceptor.java index 45356b22e6375..500616662293b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/AlphaInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/AlphaInterceptor.java @@ -1,10 +1,10 @@ package io.quarkus.arc.test.unused; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Alpha @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java index 02fab14a65e04..fdc748df9a772 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Bravo.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/BravoInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/BravoInterceptor.java index f1fa2e03e5393..9e4c2a4de0f6e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/BravoInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/BravoInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.unused; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Alpha @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java index df54d4ddf683b..3fd4dbabdfd45 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/Counter.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Bravo // Intercepted by Bravo, injected in Alpha! @Singleton diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java index 89c12cf726f8a..5de6b95a640bd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java @@ -7,17 +7,17 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java index e3edf75dd84a7..a694815d69bbd 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedDecoratorTest.java @@ -4,12 +4,12 @@ import java.util.Set; -import javax.annotation.Priority; -import javax.decorator.Decorator; -import javax.decorator.Delegate; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.decorator.Decorator; +import jakarta.decorator.Delegate; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java index be8971eda0a91..31cc03a480fc9 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedInterceptorTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.util.AnnotationLiteral; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java index a091442f73623..2fbb9a066578e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/AbstractNormalScopedFinalTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java index ee195e8bca5c5..89b3391b49427 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorFinalTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java index 00999bfd34412..7f62d688dfca2 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/BoundInterceptorPrivateNoArgsConstructorTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java index c0c47f3fd430f..edfee0c34414b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ClassBeanMultipleScopesTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Singleton; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Singleton; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java index 968c141e564c5..148d8a38fd1bf 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedAsyncObserverTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.ObservesAsync; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.ObservesAsync; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java index a4e0bcfab8f4a..5fd439a1ff593 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedDisposerTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java index f4f4b64243637..7f6c8034df706 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedObserverTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java index 338b56a4fb96e..39529f391879b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InitializerMethodMarkedProducerTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DefinitionException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructTest.java index 0994fc10c014d..333784b69af00 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructWithParametersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructWithParametersTest.java index cab640a82436a..22670f7406192 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructWithParametersTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPostConstructWithParametersTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPreDestroyTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPreDestroyTest.java index 26e2b7a46fcb0..e966915d3108e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPreDestroyTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/InvalidPreDestroyTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java index 125cd7685198d..3c769f0bcba2c 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedConstructorTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.DeploymentException; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java index 6c32c5ac71ea7..3e78e6f1c9f0d 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/NormalScopedPrivateNoArgsConstructorTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.spi.DeploymentException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java index caf2308068e8d..068cf4585e1ef 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerFieldMultipleScopesTest.java @@ -5,11 +5,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java index 85f6ac327d5e9..5933da009511e 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/ProducerMethodMultipleScopesTest.java @@ -5,11 +5,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java index 036466f573e96..324e6432f2c55 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/Simple.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/SimpleInterceptor.java index dba0728e1995a..8ff47300ef92b 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/SimpleInterceptor.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/SimpleInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.arc.test.validation; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple @Priority(1) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java index 92da8e090f1f2..b0022da642897 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnFieldTest.java @@ -8,9 +8,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java index 320c0d2bbfa9d..9a7ec7486aa3f 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/validation/StereotypeOnMethodTest.java @@ -8,9 +8,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.DefinitionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java index 1525641c2855a..eac4de9fdab13 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/Logging.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java index 71cc95a8f0369..02ed2be953f40 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/VetoedTest.java @@ -7,12 +7,12 @@ import java.util.AbstractList; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Vetoed; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Vetoed; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/PackageVetoed.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/PackageVetoed.java index ba5fad7a05341..39cd0544c4e32 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/PackageVetoed.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/PackageVetoed.java @@ -1,6 +1,6 @@ package io.quarkus.arc.test.vetoed.subpkg; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class PackageVetoed { diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/package-info.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/package-info.java index d71de85769d4d..0cf08ed790016 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/package-info.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/vetoed/subpkg/package-info.java @@ -1,4 +1,4 @@ @Vetoed package io.quarkus.arc.test.vetoed.subpkg; -import javax.enterprise.inject.Vetoed; \ No newline at end of file +import jakarta.enterprise.inject.Vetoed; diff --git a/independent-projects/bootstrap/bom/pom.xml b/independent-projects/bootstrap/bom/pom.xml index 105d6b2fff944..67df74fdc018c 100644 --- a/independent-projects/bootstrap/bom/pom.xml +++ b/independent-projects/bootstrap/bom/pom.xml @@ -71,16 +71,6 @@ org.apache.maven maven-plugin-api ${maven-core.version} - - - javax.annotation - javax.annotation-api - - - javax.inject - javax.inject - - org.apache.maven @@ -118,10 +108,6 @@ maven-core ${maven-core.version} - - javax.inject - javax.inject - org.checkerframework checker-qual @@ -145,19 +131,12 @@ org.sonatype.plexus plexus-cipher - - javax.annotation - javax.annotation-api - - - javax.inject - javax.inject - org.slf4j slf4j-api - + + org.codehaus.plexus plexus-utils @@ -198,15 +177,21 @@ jakarta.inject-api ${jakarta.inject-api.version} + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + + + javax.inject + javax.inject + ${javax.inject.version} + org.apache.maven maven-resolver-provider ${maven-core.version} - - javax.inject - javax.inject - org.slf4j slf4j-api @@ -218,10 +203,6 @@ maven-settings-builder ${maven-core.version} - - javax.inject - javax.inject - org.codehaus.plexus plexus-utils diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index b16f12e073273..d7ae1cbad26ba 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -30,6 +30,10 @@ HEAD + 1.0.0 + 5.0.0 + 1.3.2 + 1 UTF-8 11 11 @@ -52,9 +56,9 @@ 4.4.16 1.0.0.Final 2.14.2 - 1.3.5 - 2.0.2 - 1.0 + 2.1.1 + 4.0.1 + 2.0.1 2.11.0 3.12.0 31.1-jre @@ -65,7 +69,7 @@ 1.7.36 22.3.0 2.6.0 - 1.13.2 + 2.0.0 7.5.1 0.0.9 0.1.3 diff --git a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml index 0e95dae390b0c..ecca017d9cca1 100644 --- a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml +++ b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml @@ -17,18 +17,20 @@ org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec --> - jakarta.xml.bind:jakarta.xml.bind-api - jakarta.ws.rs:jakarta.ws.rs-api + org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec + org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec + org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec javax.activation:activation javax.activation:javax.activation-api - javax.annotation:javax.annotation-api + javax.enterprise:cdi-api - javax.inject:javax.inject + javax.json:javax.json-api javax.json.bind:javax.json.bind-api org.glassfish:javax.json org.glassfish:javax.el + org.glassfish:jakarta.el javax.persistence:javax.persistence-api javax.persistence:persistence-api javax.security.enterprise:javax.security.enterprise-api @@ -40,8 +42,8 @@ javax.xml.bind:jaxb-api javax.websocket:javax.websocket-api javax.ws.rs:javax.ws.rs-api - - jakarta.activation:jakarta.activation-api + + com.sun.activation:jakarta.activation org.jboss.logging:jboss-logmanager org.jboss.logging:jboss-logging-jdk @@ -51,8 +53,8 @@ org.wildfly.client:wildfly-client-config org.jboss.marshalling:jboss-marshalling-osgi org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec - - jakarta.json:jakarta.json-api + org.glassfish:jakarta.json + org.eclipse.parsson:jakarta.json io.netty:netty-all diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index d54a66351ebe5..29ce4f5a25cfa 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -29,6 +29,10 @@ HEAD + 1.0.0 + 5.0.0 + 1.3.2 + 1 UTF-8 11 11 diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index 2000c354185aa..3b50866e86d90 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -47,7 +47,7 @@ 3.5.0.Final 3.0.0-M8 1.6.8 - 1.9.0 + 2.1.0 diff --git a/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java b/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java index 40495c4ac1100..d9405232cdf91 100644 --- a/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java +++ b/independent-projects/resteasy-reactive/build-support/src/main/java/org/jboss/resteasy/reactive/build/support/AllWriteableMessageBodyWriterByteBuddyPlugin.java @@ -9,8 +9,8 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.types.AllWriteableMarker; diff --git a/independent-projects/resteasy-reactive/client/processor/pom.xml b/independent-projects/resteasy-reactive/client/processor/pom.xml index 98a7ae2206e86..bf6cbab1028db 100644 --- a/independent-projects/resteasy-reactive/client/processor/pom.xml +++ b/independent-projects/resteasy-reactive/client/processor/pom.xml @@ -31,8 +31,8 @@ resteasy-reactive-common-processor - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api jakarta.enterprise diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java index 1325f3ad1f793..d56ce79303f9a 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParser.java @@ -20,7 +20,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java index 6d7951ed1f80d..e390280be4816 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java +++ b/independent-projects/resteasy-reactive/client/processor/src/main/java/org/jboss/resteasy/reactive/client/processor/scanning/ClientEndpointIndexer.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.client.processor.scanning; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_ARRAY; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_NUMBER; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_OBJECT; @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; @@ -195,13 +195,13 @@ private void addReaderWriterForType(AdditionalReaderWriter additionalReaderWrite if (dotName.equals(JSONP_JSON_NUMBER) || dotName.equals(JSONP_JSON_VALUE) || dotName.equals(JSONP_JSON_STRING)) { - additionalReaderWriter.add(JsonValueHandler.class, APPLICATION_JSON, javax.json.JsonValue.class); + additionalReaderWriter.add(JsonValueHandler.class, APPLICATION_JSON, jakarta.json.JsonValue.class); } else if (dotName.equals(JSONP_JSON_ARRAY)) { - additionalReaderWriter.add(JsonArrayHandler.class, APPLICATION_JSON, javax.json.JsonArray.class); + additionalReaderWriter.add(JsonArrayHandler.class, APPLICATION_JSON, jakarta.json.JsonArray.class); } else if (dotName.equals(JSONP_JSON_OBJECT)) { - additionalReaderWriter.add(JsonObjectHandler.class, APPLICATION_JSON, javax.json.JsonObject.class); + additionalReaderWriter.add(JsonObjectHandler.class, APPLICATION_JSON, jakarta.json.JsonObject.class); } else if (dotName.equals(JSONP_JSON_STRUCTURE)) { - additionalReaderWriter.add(JsonStructureHandler.class, APPLICATION_JSON, javax.json.JsonStructure.class); + additionalReaderWriter.add(JsonStructureHandler.class, APPLICATION_JSON, jakarta.json.JsonStructure.class); } } diff --git a/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java b/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java index 12ea91cd1b266..7a74f7a4337d5 100644 --- a/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java +++ b/independent-projects/resteasy-reactive/client/processor/src/test/java/org/jboss/resteasy/reactive/client/processor/beanparam/BeanParamParserTest.java @@ -9,12 +9,12 @@ import java.util.List; import java.util.function.Consumer; -import javax.ws.rs.BeanParam; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; diff --git a/independent-projects/resteasy-reactive/client/runtime/pom.xml b/independent-projects/resteasy-reactive/client/runtime/pom.xml index 54ab535945c1b..9855adf1df501 100644 --- a/independent-projects/resteasy-reactive/client/runtime/pom.xml +++ b/independent-projects/resteasy-reactive/client/runtime/pom.xml @@ -27,8 +27,8 @@ jakarta.enterprise.cdi-api - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java index e23fb895f248a..fe90b5243317a 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java @@ -7,14 +7,14 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.ResteasyReactiveClientProblem; import org.jboss.resteasy.reactive.common.jaxrs.StatusTypeImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java index fef67327899ca..c369e987ca940 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFilterRestHandler.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.client.handlers; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.ClientRequestFilter; import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java index 44a28a884cbbb..873bb8fd62d19 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseCompleteRestHandler.java @@ -10,10 +10,10 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.client.impl.ClientResponseBuilderImpl; import org.jboss.resteasy.reactive.client.impl.ClientResponseContextImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java index 2a31416e2444b..b5c8db5a7b1b9 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseFilterRestHandler.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.client.handlers; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.ClientResponseFilter; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java index 8d1d7d62c3cbb..f4c0d51855917 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java @@ -14,13 +14,13 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Variant; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.AsyncResultUni; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java index 2b3ccf504efcb..4e4f5745ad57e 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java @@ -3,11 +3,11 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.StatusType; import org.jboss.resteasy.reactive.client.api.WebClientApplicationException; import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java index 69143868b9737..67f475bda7920 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java @@ -7,8 +7,8 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.InterceptorContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.InterceptorContext; public abstract class AbstractClientInterceptorContextImpl implements InterceptorContext { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java index 91f4cefe15dcf..422695cea5844 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.client.impl; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.RxInvoker; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.RxInvoker; +import jakarta.ws.rs.core.GenericType; public abstract class AbstractRxInvoker implements RxInvoker { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java index 8708360ffce7a..83129607a2bde 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java @@ -10,13 +10,13 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import javax.ws.rs.client.AsyncInvoker; -import javax.ws.rs.client.CompletionStageRxInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.InvocationCallback; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.AsyncInvoker; +import jakarta.ws.rs.client.CompletionStageRxInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java index 2c51b18d2dd3f..90bccd8b89c26 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java @@ -19,11 +19,12 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; + +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.api.ClientLogger; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java index a7ea3759d8a86..f985b1772c884 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java @@ -20,13 +20,14 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; + +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.api.ClientLogger; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java index 88be8ed791c17..02208bffab490 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.function.BiFunction; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.client.api.InvalidRestClientDefinitionException; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java index f8ccc56bbcefa..200f0c5bcc8eb 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java @@ -10,14 +10,14 @@ import java.util.Map; import java.util.ServiceLoader; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.ReaderInterceptorContext; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.ReaderInterceptorContext; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.client.spi.MissingMessageBodyReaderErrorMessageContextualizer; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java index 486e7e3d00dd4..fcd63ed74d957 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java @@ -22,16 +22,16 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicBoolean; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; import org.jboss.resteasy.reactive.common.NotImplementedYet; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java index 57502bcd796af..9206508372bc0 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java @@ -6,11 +6,11 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java index d67012b3d084b..52a953b6035ea 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java @@ -3,7 +3,7 @@ import java.io.InputStream; import java.net.URI; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.NotImplementedYet; import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java index 4c8694d0f5bad..ca04826b1e2ad 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java @@ -8,14 +8,14 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Link.Builder; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Link.Builder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response.StatusType; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.headers.LinkHeaders; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java index 7c04c7e329a49..7a31e3421077d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java @@ -5,8 +5,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; import org.jboss.resteasy.reactive.common.util.EmptyInputStream; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java index a20995e83766b..c8c0630dbbb7e 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRestResponseImpl.java @@ -5,8 +5,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.jaxrs.RestResponseImpl; import org.jboss.resteasy.reactive.common.util.EmptyInputStream; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java index 8a5b331cc04c8..fc837e422aae4 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java @@ -10,19 +10,19 @@ import java.util.Collections; import java.util.Map; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.providers.serialisers.ClientDefaultTextPlainBodyHandler; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java index 56f636562aee9..72ca6b69d29a0 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java @@ -8,13 +8,13 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.RuntimeType; -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.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.RuntimeType; +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.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.common.core.Serialisers; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java index 7a36da34f33dd..edb308bd79a2b 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.function.Supplier; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; import org.jboss.resteasy.reactive.client.spi.ClientContext; import org.jboss.resteasy.reactive.client.spi.ClientContextResolver; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java index 55d448d7725fc..c518a68c629aa 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/HandlerChain.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseFilter; import org.jboss.resteasy.reactive.client.api.ClientLogger; import org.jboss.resteasy.reactive.client.api.LoggingScope; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java index 947097eed0841..80c90ee0c0446 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java @@ -7,10 +7,10 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.InboundSseEvent; -import javax.ws.rs.sse.SseEvent; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.SseEvent; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java index e83834eb45dce..15e334dba600e 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java @@ -9,20 +9,20 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.CompletionStageRxInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.RxInvoker; -import javax.ws.rs.client.RxInvokerProvider; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.CompletionStageRxInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.RxInvoker; +import jakarta.ws.rs.client.RxInvokerProvider; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.core.BlockingNotAllowedException; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java index b243a03d4053a..a46f0fa19d633 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java @@ -3,13 +3,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.InvocationCallback; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; public class InvocationImpl implements Invocation { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java index aa4129bbd27b3..ead3b0a0ef12a 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java @@ -5,10 +5,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; import org.jboss.resteasy.reactive.common.util.RestMediaType; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java index 47dcf87d950ff..2923c9f8c092b 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java @@ -16,17 +16,17 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.GenericType; -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.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.GenericType; +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.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.ClientWebApplicationException; import org.jboss.resteasy.reactive.RestResponse; @@ -72,7 +72,7 @@ public class RestClientRequestContext extends AbstractResteasyReactiveContext result; private final ClientRestHandler[] abortHandlerChainWithoutResponseFilters; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java index 932fd7971039d..2b3018c4a1399 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java @@ -3,9 +3,9 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.sse.SseEventSource; -import javax.ws.rs.sse.SseEventSource.Builder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.sse.SseEventSource.Builder; public class SseEventSourceBuilderImpl extends SseEventSource.Builder { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java index 4e667efd06451..86ce7c526591c 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java @@ -6,11 +6,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.sse.InboundSseEvent; -import javax.ws.rs.sse.SseEventSource; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.sse.InboundSseEvent; +import jakarta.ws.rs.sse.SseEventSource; import org.jboss.resteasy.reactive.common.util.CommonSseUtil; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java index 47b8e54957a69..039d339d7b962 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java @@ -2,8 +2,8 @@ import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEvent; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEvent; import io.vertx.core.Handler; import io.vertx.core.buffer.Buffer; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java index 020d0d42f6fcd..6d5713e139f83 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/StorkClientRequestFilter.java @@ -3,10 +3,10 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java index 927262a55d57f..dc71c5101ed92 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java @@ -3,9 +3,9 @@ import java.util.concurrent.CompletionStage; import java.util.function.Supplier; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import io.smallrye.mutiny.Uni; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java index 2a4989df8ea5e..db696b30fe8f8 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java @@ -7,12 +7,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.client.spi.ClientRestHandler; import org.jboss.resteasy.reactive.common.core.Serialisers; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java index 3223884280ba7..f85b6c136b5d4 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/MultiByteHttpData.java @@ -20,10 +20,10 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.util.concurrent.Executor; +import java.util.concurrent.Flow.Subscription; import java.util.function.Consumer; import org.jboss.logging.Logger; -import org.reactivestreams.Subscription; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java index 026c96dbd6861..2a082ffa09edb 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartForm.java @@ -8,11 +8,11 @@ import java.util.Iterator; import java.util.List; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.client.impl.ClientSerialisers; import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java index 35f6cca4ec511..e81ecc7a0f46a 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.client.providers.serialisers; -import javax.ws.rs.Consumes; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.NoContentException; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.NoContentException; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java index 133b89dc5d3ce..53346c2f068b3 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/FieldFiller.java @@ -3,7 +3,7 @@ import java.io.File; import java.nio.file.Path; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.core.GenericType; import org.jboss.resteasy.reactive.multipart.FileDownload; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/MissingMessageBodyReaderErrorMessageContextualizer.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/MissingMessageBodyReaderErrorMessageContextualizer.java index fc374f98f848e..fc731c895f04d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/MissingMessageBodyReaderErrorMessageContextualizer.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/MissingMessageBodyReaderErrorMessageContextualizer.java @@ -3,12 +3,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public interface MissingMessageBodyReaderErrorMessageContextualizer { /** - * Takes the same input as {@link javax.ws.rs.ext.MessageBodyReader#isReadable(Class, Type, Annotation[], MediaType)} + * Takes the same input as {@link jakarta.ws.rs.ext.MessageBodyReader#isReadable(Class, Type, Annotation[], MediaType)} * and returns a {@code String} that contextualizes the error message. * The result can be null if this class is not able to provide any useful context information. */ diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java index ddc89f45029ab..b1cbc2e7809e5 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestContext.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.client.spi; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.GenericType; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.GenericType; import io.smallrye.stork.api.ServiceInstance; import io.vertx.core.Context; diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java index 684f27c144285..d4ca467842f8b 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientRequestFilter.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; public interface ResteasyReactiveClientRequestFilter extends ClientRequestFilter { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientResponseFilter.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientResponseFilter.java index a641f2768ff30..112620fd9b588 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientResponseFilter.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ResteasyReactiveClientResponseFilter.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.client.spi; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; public interface ResteasyReactiveClientResponseFilter extends ClientResponseFilter { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder b/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder similarity index 100% rename from independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder rename to independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder b/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.sse.SseEventSource$Builder similarity index 100% rename from independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder rename to independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.sse.SseEventSource$Builder diff --git a/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java b/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java index 529ad6ce5078d..db1dda6733303 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/test/java/org/jboss/resteasy/reactive/client/impl/HandlerChainTest.java @@ -5,9 +5,9 @@ import java.util.Collections; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseFilter; import org.jboss.resteasy.reactive.client.api.LoggingScope; import org.jboss.resteasy.reactive.client.logging.DefaultClientLogger; diff --git a/independent-projects/resteasy-reactive/common/processor/pom.xml b/independent-projects/resteasy-reactive/common/processor/pom.xml index e67cc7816daf5..6f185848d2939 100644 --- a/independent-projects/resteasy-reactive/common/processor/pom.xml +++ b/independent-projects/resteasy-reactive/common/processor/pom.xml @@ -28,8 +28,8 @@ resteasy-reactive-common - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api jakarta.enterprise diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java index 99e95734367b9..693085cc6f3db 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; public interface AdditionalReaderWriter { diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java index 251d019e22986..38f435afe66df 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.RuntimeType; @SuppressWarnings({ "rawtypes" }) abstract class AdditionalReaderWriterCommon implements AdditionalReaderWriter { diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java index 701260d3ae8f7..71d7978d3e7d0 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java index 9ce1793c43fc5..86008ba946ea9 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java @@ -97,10 +97,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.SseEventSink; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java index 8aff857a22989..dd8e13857d185 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java @@ -21,62 +21,63 @@ import java.util.SortedSet; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow.Publisher; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Typed; -import javax.enterprise.inject.Vetoed; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.BeanParam; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.Encoded; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.NameBinding; -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.client.InvocationCallback; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.Encoded; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.NameBinding; +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.client.InvocationCallback; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.jandex.DotName; import org.jboss.resteasy.reactive.DummyElementType; @@ -93,7 +94,6 @@ import org.jboss.resteasy.reactive.RestSseElementType; import org.jboss.resteasy.reactive.RestStreamElementType; import org.jboss.resteasy.reactive.Separator; -import org.reactivestreams.Publisher; import io.smallrye.common.annotation.Blocking; import io.smallrye.common.annotation.NonBlocking; @@ -140,14 +140,14 @@ public final class ResteasyReactiveDotNames { public static final DotName SEPARATOR = DotName.createSimple(Separator.class.getName()); public static final DotName REST_MATRIX_PARAM = DotName.createSimple(RestMatrix.class.getName()); public static final DotName REST_COOKIE_PARAM = DotName.createSimple(RestCookie.class.getName()); - public static final DotName GET = DotName.createSimple(javax.ws.rs.GET.class.getName()); - public static final DotName HEAD = DotName.createSimple(javax.ws.rs.HEAD.class.getName()); - public static final DotName DELETE = DotName.createSimple(javax.ws.rs.DELETE.class.getName()); - public static final DotName OPTIONS = DotName.createSimple(javax.ws.rs.OPTIONS.class.getName()); - public static final DotName PATCH = DotName.createSimple(javax.ws.rs.PATCH.class.getName()); - public static final DotName POST = DotName.createSimple(javax.ws.rs.POST.class.getName()); - public static final DotName PUT = DotName.createSimple(javax.ws.rs.PUT.class.getName()); - public static final DotName HTTP_METHOD = DotName.createSimple(javax.ws.rs.HttpMethod.class.getName()); + public static final DotName GET = DotName.createSimple(jakarta.ws.rs.GET.class.getName()); + public static final DotName HEAD = DotName.createSimple(jakarta.ws.rs.HEAD.class.getName()); + public static final DotName DELETE = DotName.createSimple(jakarta.ws.rs.DELETE.class.getName()); + public static final DotName OPTIONS = DotName.createSimple(jakarta.ws.rs.OPTIONS.class.getName()); + public static final DotName PATCH = DotName.createSimple(jakarta.ws.rs.PATCH.class.getName()); + public static final DotName POST = DotName.createSimple(jakarta.ws.rs.POST.class.getName()); + public static final DotName PUT = DotName.createSimple(jakarta.ws.rs.PUT.class.getName()); + public static final DotName HTTP_METHOD = DotName.createSimple(jakarta.ws.rs.HttpMethod.class.getName()); public static final DotName APPLICATION_PATH = DotName.createSimple(ApplicationPath.class.getName()); public static final DotName PATH = DotName.createSimple(Path.class.getName()); public static final DotName PARAM_CONVERTER_PROVIDER = DotName.createSimple(ParamConverterProvider.class.getName()); @@ -182,7 +182,7 @@ public final class ResteasyReactiveDotNames { public static final DotName NON_BLOCKING = DotName.createSimple(NonBlocking.class.getName()); public static final DotName SUSPENDED = DotName.createSimple(Suspended.class.getName()); public static final DotName PRE_MATCHING = DotName.createSimple(PreMatching.class.getName()); - public static final DotName TRANSACTIONAL = DotName.createSimple("javax.transaction.Transactional"); + public static final DotName TRANSACTIONAL = DotName.createSimple("jakarta.transaction.Transactional"); public static final DotName COLLECTION = DotName.createSimple(Collection.class.getName()); public static final DotName LIST = DotName.createSimple(List.class.getName()); @@ -205,6 +205,7 @@ public final class ResteasyReactiveDotNames { public static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName()); public static final DotName COMPLETABLE_FUTURE = DotName.createSimple(CompletableFuture.class.getName()); public static final DotName PUBLISHER = DotName.createSimple(Publisher.class.getName()); + public static final DotName LEGACY_PUBLISHER = DotName.createSimple(org.reactivestreams.Publisher.class.getName()); public static final DotName REST_RESPONSE = DotName.createSimple(RestResponse.class.getName()); public static final DotName INTEGER = DotName.createSimple(Integer.class.getName()); @@ -231,12 +232,12 @@ public final class ResteasyReactiveDotNames { public static final DotName OUTPUT_STREAM = DotName.createSimple(OutputStream.class.getName()); public static final DotName THROWABLE = DotName.createSimple(Throwable.class.getName()); - public static final DotName JSONP_JSON_OBJECT = DotName.createSimple(javax.json.JsonObject.class.getName()); - public static final DotName JSONP_JSON_ARRAY = DotName.createSimple(javax.json.JsonArray.class.getName()); - public static final DotName JSONP_JSON_STRUCTURE = DotName.createSimple(javax.json.JsonStructure.class.getName()); - public static final DotName JSONP_JSON_NUMBER = DotName.createSimple(javax.json.JsonNumber.class.getName()); - public static final DotName JSONP_JSON_VALUE = DotName.createSimple(javax.json.JsonValue.class.getName()); - public static final DotName JSONP_JSON_STRING = DotName.createSimple(javax.json.JsonString.class.getName()); + public static final DotName JSONP_JSON_OBJECT = DotName.createSimple(jakarta.json.JsonObject.class.getName()); + public static final DotName JSONP_JSON_ARRAY = DotName.createSimple(jakarta.json.JsonArray.class.getName()); + public static final DotName JSONP_JSON_STRUCTURE = DotName.createSimple(jakarta.json.JsonStructure.class.getName()); + public static final DotName JSONP_JSON_NUMBER = DotName.createSimple(jakarta.json.JsonNumber.class.getName()); + public static final DotName JSONP_JSON_VALUE = DotName.createSimple(jakarta.json.JsonValue.class.getName()); + public static final DotName JSONP_JSON_STRING = DotName.createSimple(jakarta.json.JsonString.class.getName()); public static final DotName CONTAINER_REQUEST_CONTEXT = DotName.createSimple(ContainerRequestContext.class.getName()); public static final DotName CONTAINER_RESPONSE_CONTEXT = DotName.createSimple(ContainerResponseContext.class.getName()); @@ -278,20 +279,20 @@ public final class ResteasyReactiveDotNames { public static final DotName OBJECT_NAME = DotName.createSimple(Object.class.getName()); // Types ignored for reflection used by the RESTEasy and SmallRye REST client extensions. private static final Set TYPES_IGNORED_FOR_REFLECTION = new HashSet<>(Arrays.asList( - // javax.json - DotName.createSimple("javax.json.JsonObject"), - DotName.createSimple("javax.json.JsonArray"), - DotName.createSimple("javax.json.JsonValue"), + // jakarta.json + DotName.createSimple("jakarta.json.JsonObject"), + DotName.createSimple("jakarta.json.JsonArray"), + DotName.createSimple("jakarta.json.JsonValue"), // Jackson DotName.createSimple("com.fasterxml.jackson.databind.JsonNode"), // JAX-RS - DotName.createSimple("javax.ws.rs.core.Response"), - DotName.createSimple("javax.ws.rs.container.AsyncResponse"), - DotName.createSimple("javax.ws.rs.core.StreamingOutput"), - DotName.createSimple("javax.ws.rs.core.Form"), - DotName.createSimple("javax.ws.rs.core.MultivaluedMap"), + DotName.createSimple("jakarta.ws.rs.core.Response"), + DotName.createSimple("jakarta.ws.rs.container.AsyncResponse"), + DotName.createSimple("jakarta.ws.rs.core.StreamingOutput"), + DotName.createSimple("jakarta.ws.rs.core.Form"), + DotName.createSimple("jakarta.ws.rs.core.MultivaluedMap"), // RESTEasy DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartInput"), diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java index ad8efda09f9af..a881ada5317a2 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.jboss.jandex.ClassInfo; import org.jboss.resteasy.reactive.common.processor.BlockingDefault; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java index 3af6649616ca5..a0d59b90321dc 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java @@ -11,8 +11,8 @@ import java.util.Set; import java.util.function.Function; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java index 834d2092b84ba..2b757040a0e11 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java @@ -24,10 +24,10 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.Application; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.Application; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java index bc7f752edea1e..900513163de66 100644 --- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java +++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ScannedSerializer.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; public class ScannedSerializer { diff --git a/independent-projects/resteasy-reactive/common/runtime/pom.xml b/independent-projects/resteasy-reactive/common/runtime/pom.xml index b31fdda3d497b..2447d17a34748 100644 --- a/independent-projects/resteasy-reactive/common/runtime/pom.xml +++ b/independent-projects/resteasy-reactive/common/runtime/pom.xml @@ -22,21 +22,29 @@ io.smallrye.reactive mutiny + + org.reactivestreams + reactive-streams + + + io.smallrye.reactive + mutiny-zero-flow-adapters + io.smallrye.common smallrye-common-annotation - org.glassfish - jakarta.json + org.eclipse.parsson + parsson jakarta.enterprise jakarta.enterprise.cdi-api - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ClientWebApplicationException.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ClientWebApplicationException.java index 3183791deb504..33f61c2a57769 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ClientWebApplicationException.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ClientWebApplicationException.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; public class ClientWebApplicationException extends WebApplicationException implements ResteasyReactiveClientProblem { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java index 514940670f7ae..eff37c1585331 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.BeanParam; +import jakarta.ws.rs.BeanParam; /** * Annotation to be used on POJOs meant to map to the various parts diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java index ab22ae902963a..18bb9eca53848 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseHeader.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * When placed on a resource method, then RESTEasy Reactive will the specified HTTP response headers, diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java index 78e25f00d3c56..ae481c21d1f45 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/ResponseStatus.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * When placed on a resource method, then RESTEasy Reactive will set the HTTP status to the specified value, diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java index b1412b20a4e29..539a295d74e72 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestResponse.java @@ -9,25 +9,25 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.NoContentException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.Variant; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.NoContentException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Variant; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.RuntimeDelegate; /** * Defines the contract between a returned instance and the runtime when @@ -86,7 +86,7 @@ protected RestResponse() { /** * Read the message entity input stream as an instance of specified Java type - * using a {@link javax.ws.rs.ext.MessageBodyReader} that supports mapping the + * using a {@link jakarta.ws.rs.ext.MessageBodyReader} that supports mapping the * message entity stream onto the requested type. *

    * Method throws an {@link ProcessingException} if the content of the @@ -117,13 +117,13 @@ protected RestResponse() { * the response has been {@link #close() closed} already, * or if the entity input stream has been fully consumed already and has * not been buffered prior consuming. - * @see javax.ws.rs.ext.MessageBodyReader + * @see jakarta.ws.rs.ext.MessageBodyReader */ public abstract OtherT readEntity(Class entityType); /** * Read the message entity input stream as an instance of specified Java type - * using a {@link javax.ws.rs.ext.MessageBodyReader} that supports mapping the + * using a {@link jakarta.ws.rs.ext.MessageBodyReader} that supports mapping the * message entity stream onto the requested type. *

    * Method throws an {@link ProcessingException} if the content of the @@ -154,13 +154,13 @@ protected RestResponse() { * the response has been {@link #close() closed} already, * or if the entity input stream has been fully consumed already and has * not been buffered prior consuming. - * @see javax.ws.rs.ext.MessageBodyReader + * @see jakarta.ws.rs.ext.MessageBodyReader */ public abstract OtherT readEntity(GenericType entityType); /** * Read the message entity input stream as an instance of specified Java type - * using a {@link javax.ws.rs.ext.MessageBodyReader} that supports mapping the + * using a {@link jakarta.ws.rs.ext.MessageBodyReader} that supports mapping the * message entity stream onto the requested type. *

    * Method throws an {@link ProcessingException} if the content of the @@ -192,13 +192,13 @@ protected RestResponse() { * the response has been {@link #close() closed} already, * or if the entity input stream has been fully consumed already and has * not been buffered prior consuming. - * @see javax.ws.rs.ext.MessageBodyReader + * @see jakarta.ws.rs.ext.MessageBodyReader */ public abstract OtherT readEntity(Class entityType, Annotation[] annotations); /** * Read the message entity input stream as an instance of specified Java type - * using a {@link javax.ws.rs.ext.MessageBodyReader} that supports mapping the + * using a {@link jakarta.ws.rs.ext.MessageBodyReader} that supports mapping the * message entity stream onto the requested type. *

    * Method throws an {@link ProcessingException} if the content of the @@ -230,7 +230,7 @@ protected RestResponse() { * the response has been {@link #close() closed} already, * or if the entity input stream has been fully consumed already and has * not been buffered prior consuming. - * @see javax.ws.rs.ext.MessageBodyReader + * @see jakarta.ws.rs.ext.MessageBodyReader */ public abstract OtherT readEntity(GenericType entityType, Annotation[] annotations); @@ -239,8 +239,8 @@ protected RestResponse() { * {@code true} if the entity is present, returns {@code false} otherwise. *

    * Note that the method may return {@code true} also for response messages with - * a zero-length content, in case the {@value javax.ws.rs.core.HttpHeaders#CONTENT_LENGTH} and - * {@value javax.ws.rs.core.HttpHeaders#CONTENT_TYPE} headers are specified in the message. + * a zero-length content, in case the {@value jakarta.ws.rs.core.HttpHeaders#CONTENT_LENGTH} and + * {@value jakarta.ws.rs.core.HttpHeaders#CONTENT_TYPE} headers are specified in the message. * In such case, an attempt to read the entity using one of the {@code readEntity(...)} * methods will return a corresponding instance representing a zero-length entity for a * given Java type or produce a {@link ProcessingException} in case no such instance @@ -443,8 +443,8 @@ protected RestResponse() { * server side. Changes in the underlying header data are reflected in this view. *

    * On the server-side, when the message is sent, the non-string values will be serialized - * using a {@link javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if one is available via - * {@link javax.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)} for the + * using a {@link jakarta.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if one is available via + * {@link jakarta.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)} for the * class of the value or using the values {@code toString} method if a header delegate is * not available. *

    @@ -477,8 +477,8 @@ public MultivaluedMap getHeaders() { * Get a message header as a single string value. * * Each single header value is converted to String using a - * {@link javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if one is available - * via {@link javax.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)} + * {@link jakarta.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if one is available + * via {@link jakarta.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)} * for the header value class or using its {@code toString} method if a header * delegate is not available. * @@ -931,7 +931,7 @@ public ResponseBuilder status(Status status) { * @param entity the request entity. * @return updated response builder instance. * @see #entity(java.lang.Object, java.lang.annotation.Annotation[]) - * @see #type(javax.ws.rs.core.MediaType) + * @see #type(jakarta.ws.rs.core.MediaType) * @see #type(java.lang.String) */ public abstract ResponseBuilder entity(T entity); @@ -954,7 +954,7 @@ public ResponseBuilder status(Status status) { * method that returns the built response). * @return updated response builder instance. * @see #entity(java.lang.Object) - * @see #type(javax.ws.rs.core.MediaType) + * @see #type(jakarta.ws.rs.core.MediaType) * @see #type(java.lang.String) */ public abstract ResponseBuilder entity(T entity, Annotation[] annotations); @@ -1002,8 +1002,8 @@ public ResponseBuilder status(Status status) { * * @param name the name of the header * @param value the value of the header, the header will be serialized - * using a {@link javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if - * one is available via {@link javax.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)} + * using a {@link jakarta.ws.rs.ext.RuntimeDelegate.HeaderDelegate} if + * one is available via {@link jakarta.ws.rs.ext.RuntimeDelegate#createHeaderDelegate(java.lang.Class)} * for the class of {@code value} or using its {@code toString} method * if a header delegate is not available. If {@code value} is {@code null} * then all current headers of the same name will be removed. @@ -1067,7 +1067,7 @@ public ResponseBuilder status(Status status) { * @return the updated response builder. * @see #encoding(java.lang.String) * @see #language(java.util.Locale) - * @see #type(javax.ws.rs.core.MediaType) + * @see #type(jakarta.ws.rs.core.MediaType) */ public abstract ResponseBuilder variant(Variant variant); diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java index 92d82baf594a8..7b57c785c0b94 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java @@ -11,8 +11,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; -import javax.ws.rs.container.CompletionCallback; -import javax.ws.rs.container.ConnectionCallback; +import jakarta.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.ConnectionCallback; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.PreserveTargetException; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java index 957d9f1db49e8..c2d39f2c4dc67 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.client.InvocationCallback; public class GenericTypeMapping { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java index b6578c524df0a..475988d448e06 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.common.core; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java index 364601cd03c23..ec453a8c26e0c 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.common.core; -import javax.ws.rs.container.CompletionCallback; -import javax.ws.rs.container.ConnectionCallback; +import jakarta.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.ConnectionCallback; public interface ResteasyReactiveCallbackContext { public void registerCompletionCallback(CompletionCallback callback); diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java index 1f5020bae6a4b..9daa23b1097ff 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java @@ -12,14 +12,14 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.ResourceReader; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnwrappableException.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnwrappableException.java index 450c73f39c024..b0bb50baf98a2 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnwrappableException.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnwrappableException.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.common.core; -import javax.ws.rs.ProcessingException; +import jakarta.ws.rs.ProcessingException; public class UnwrappableException extends ProcessingException { public UnwrappableException(Throwable cause) { super(cause); } -} \ No newline at end of file +} diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java index 904a8010b2a48..3cf3f681f1c06 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.ExtendedCacheControl; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java index eed42b0f1658b..443baeec0b5da 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.common.headers; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.CookieParser; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java index ff0f26ff762df..87fa210488d0d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java @@ -2,7 +2,7 @@ import java.util.Date; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.DateUtil; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java index 6510d625e2b3c..74afe0a9fbcda 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.common.headers; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.ext.RuntimeDelegate; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java index 7d07da8ecaff8..28d078838e5fb 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java @@ -14,13 +14,13 @@ import java.util.Set; import java.util.StringTokenizer; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.CookieParser; import org.jboss.resteasy.reactive.common.util.DateUtil; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java index dc33bf02f41a0..5179d876e1c5a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.jaxrs.LinkBuilderImpl; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java index 901076b74aea8..c9d66cd7b9038 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MultivaluedMap; public class LinkHeaders { private final Map linksByRelationship = new HashMap<>(); diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java index 63184f7bc908a..857e292fab7ad 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java @@ -2,7 +2,7 @@ import java.util.Locale; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.LocaleHelper; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java index 0441048397da8..88977f12023af 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.HeaderParameterParser; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java index 67eb1a4c8c0c8..36278874b05af 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java @@ -6,8 +6,8 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.DateUtil; import org.jboss.resteasy.reactive.common.util.OrderedParameterParser; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java index d9cddc7dea2ae..4a44995e36055 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.ext.RuntimeDelegate; public class ObjectToStringDelegate implements RuntimeDelegate.HeaderDelegate { public static final ObjectToStringDelegate INSTANCE = new ObjectToStringDelegate(); diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java index 27a43da67ef28..add1a29f5cf13 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java @@ -12,15 +12,15 @@ import java.util.Set; import java.util.TimeZone; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java index 62bf5678b37e1..df0fe3a826d7a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java @@ -13,14 +13,14 @@ import java.util.Set; import java.util.TimeZone; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java index f8985ea9c5dea..33f06b164fd69 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java @@ -11,25 +11,25 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Priority; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.Consumes; -import javax.ws.rs.Priorities; -import javax.ws.rs.Produces; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.client.RxInvokerProvider; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.RxInvokerProvider; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.common.core.UnmanagedBeanFactory; import org.jboss.resteasy.reactive.common.model.ResourceReader; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java index 1c2ed3ed16851..8e72cbc792c89 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java @@ -4,9 +4,9 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java index 6c0fb23e6b593..aaaddaab6950d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.RuntimeDelegate; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java index 5d9adc0bfda10..b35ef6614dd65 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java @@ -16,16 +16,16 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Link.Builder; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Link.Builder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.headers.LinkHeaders; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java index c6c3ff28e9593..142ebb122bc2c 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RestResponseImpl.java @@ -16,16 +16,16 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Link.Builder; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Link.Builder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java index 7381900547fc5..efa84eb922653 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java @@ -3,18 +3,21 @@ import java.util.Date; import java.util.Locale; import java.util.ServiceLoader; +import java.util.concurrent.CompletionStage; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.Variant; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.SeBootstrap; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.EntityPart; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Variant; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.RestResponse.ResponseBuilder; @@ -115,4 +118,30 @@ public HeaderDelegate createHeaderDelegate(Class type) throws IllegalA public Link.Builder createLinkBuilder() { return new LinkBuilderImpl(); } + + @Override + public SeBootstrap.Configuration.Builder createConfigurationBuilder() { + // RR does not implement currently implement the bootstrapping API + throw new UnsupportedOperationException("Pending implementation"); + } + + @Override + public CompletionStage bootstrap(Application application, + SeBootstrap.Configuration configuration) { + // RR does not implement currently implement the bootstrapping API + throw new UnsupportedOperationException("Pending implementation"); + } + + @Override + public CompletionStage bootstrap(Class aClass, + SeBootstrap.Configuration configuration) { + // RR does not implement currently implement the bootstrapping API + throw new UnsupportedOperationException("Pending implementation"); + } + + @Override + public EntityPart.Builder createEntityPartBuilder(String s) throws IllegalArgumentException { + // TODO: figure out how to implement this + throw new UnsupportedOperationException("Pending implementation"); + } } diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java index 4364ff3a840cf..9ff93681c58d4 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; public class StatusTypeImpl implements StatusType { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java index 5a08cdc9a4672..710bff12906e2 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java @@ -10,11 +10,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.Path; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.PathHelper; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java index 523d1318719b0..96526e2efa8e6 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Locale; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Variant; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java index aaf593e8ac8b3..6da737d42835a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.function.Supplier; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jboss.resteasy.reactive.common.core.LazyUnmanagedBeanFactory; import org.jboss.resteasy.reactive.common.util.URLUtils; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java index 5651b4d38dae0..9002592b67333 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java @@ -4,8 +4,8 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ContextResolver; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java index 4d011392619f5..e82b8ecf04891 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.common.model; -import javax.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.DynamicFeature; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java index 705e560e66530..ef7a63e365e37 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java index 93c30f86187ce..071f191f88573 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.common.model; -import javax.ws.rs.core.Feature; +import jakarta.ws.rs.core.Feature; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java index 146b956b24fee..ab224307bcd25 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java index b864cf146b2e3..0e0c2954364e7 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java @@ -2,10 +2,10 @@ import java.util.function.Function; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java index 54463c2a191fa..37baf4b5c0d4f 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; import org.jboss.resteasy.reactive.RestSseElementType; import org.jboss.resteasy.reactive.RestStreamElementType; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java index 075203646d35c..1c22143d99364 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.common.model; -import javax.ws.rs.Priorities; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java index aed58a6bbf319..538c6194e5a48 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java @@ -5,10 +5,10 @@ import java.util.Comparator; import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyReader; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java index be8d9dd5a1e00..dae02708bc64e 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java @@ -6,10 +6,10 @@ import java.util.Comparator; import java.util.List; -import javax.ws.rs.Priorities; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java index 165817e5eff28..50bf2637442e4 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/AbstractJsonMessageBodyReader.java @@ -3,8 +3,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyReader; public abstract class AbstractJsonMessageBodyReader implements MessageBodyReader { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java index ef6abaa701d69..c183238e3fcaa 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java @@ -5,10 +5,10 @@ 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.MessageBodyReader; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; public class BooleanMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader { public Boolean readFrom(Class type, Type genericType, Annotation[] annotations, MediaType mediaType, diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java index abb3a72d04745..5799cbed44471 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java @@ -6,11 +6,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.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class ByteArrayMessageBodyHandler implements MessageBodyReader, MessageBodyWriter { public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java index a745668295661..c52b6a4220352 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java @@ -7,11 +7,11 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class CharArrayMessageBodyHandler implements MessageBodyReader, MessageBodyWriter { public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java index b645ded0b5b81..7eb90bc8c0fdc 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java @@ -5,11 +5,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; public class CharacterMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader { public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java index a5dfea4312a8e..ab3b3c25dc0b6 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java @@ -5,11 +5,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; import org.jboss.resteasy.reactive.common.util.TypeConverter; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java index 04d1f9fbfa4c9..82d2045179024 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.nio.file.Files; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java index 77bd8fe70ecbf..7f3bceec30062 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FilePartBodyHandler.java @@ -7,10 +7,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.FilePart; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java index d2df81406562d..7c409cd8d2b1c 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java @@ -10,12 +10,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java index fe1465847e923..f8e926f74628b 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java @@ -6,11 +6,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.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class InputStreamMessageBodyHandler implements MessageBodyWriter, MessageBodyReader { public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/JsonMessageBodyWriterUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/JsonMessageBodyWriterUtil.java index b663ea75cc706..039a8936286f9 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/JsonMessageBodyWriterUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/JsonMessageBodyWriterUtil.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.common.providers.serialisers; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; public class JsonMessageBodyWriterUtil { public static void setContentTypeIfNecessary(MultivaluedMap httpHeaders) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java index 2ca465a244bb1..a5121d01055b4 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MapAsFormUrlEncodedProvider.java @@ -10,11 +10,11 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.util.Encode; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java index c2707999f0aa8..4be10c5d524b3 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java @@ -4,7 +4,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public class MessageReaderUtil { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java index e5ea969392294..a8215292d5c13 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java @@ -7,10 +7,10 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; public class NumberMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader { public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java index 9e3153fe490f0..2341ae5b0eff9 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathBodyHandler.java @@ -6,10 +6,10 @@ import java.lang.reflect.Type; import java.nio.file.Files; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; public class PathBodyHandler implements MessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java index 0fc70f05f2626..ad7e6611262f9 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PathPartBodyHandler.java @@ -7,10 +7,10 @@ import java.lang.reflect.Type; import java.nio.file.Files; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.PathPart; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java index c72228d0e4414..da5518ed34b24 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java @@ -6,7 +6,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.NoContentException; +import jakarta.ws.rs.core.NoContentException; public abstract class PrimitiveBodyHandler { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java index 21077e042d7dc..b550fb38e6e6f 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java @@ -8,10 +8,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class ReaderBodyHandler implements MessageBodyWriter, MessageBodyReader { public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java index 3b1f261ac9413..fb8dfb85f8000 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java @@ -7,11 +7,11 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class StringMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader, MessageBodyWriter { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java index 21b104506dab1..75da99da4609d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java @@ -6,13 +6,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.json.JsonArray; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.json.JsonArray; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class JsonArrayHandler implements MessageBodyReader, MessageBodyWriter { public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java index 8741492eeced6..b704cf56dc497 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java @@ -6,13 +6,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.json.JsonObject; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.json.JsonObject; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class JsonObjectHandler implements MessageBodyReader, MessageBodyWriter { public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java index 16b9b29735125..92c4d966ebd0a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java @@ -6,14 +6,14 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.json.JsonObject; -import javax.json.JsonStructure; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.json.JsonObject; +import jakarta.json.JsonStructure; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class JsonStructureHandler implements MessageBodyReader, MessageBodyWriter { public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java index 42c0d670a2bd6..62e99ddd18f0d 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java @@ -6,13 +6,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.json.JsonValue; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; public class JsonValueHandler implements MessageBodyReader, MessageBodyWriter { public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java index 71df60d2e6440..a2bf5953771a3 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java @@ -4,12 +4,12 @@ import java.io.OutputStream; import java.nio.charset.Charset; -import javax.json.Json; -import javax.json.JsonReader; -import javax.json.JsonReaderFactory; -import javax.json.JsonWriter; -import javax.json.JsonWriterFactory; -import javax.ws.rs.core.MediaType; +import jakarta.json.Json; +import jakarta.json.JsonReader; +import jakarta.json.JsonReaderFactory; +import jakarta.json.JsonWriter; +import jakarta.json.JsonWriterFactory; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java index cea93637af53f..38cb2bc82c895 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Cookie; +import jakarta.ws.rs.core.Cookie; public class CookieParser { public static List parseCookies(String cookieHeader) { diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java index cb171a629f86d..17726659e418b 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java @@ -13,7 +13,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java index af14d0935ef13..97431df190514 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.common.util; -import javax.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.CacheControl; /** * Adds support for the public directive which is not supported by {@link CacheControl} for some reason. diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java index df5d50ab6f21d..eeea0e58cfd2a 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java @@ -8,9 +8,9 @@ import java.util.Map; import java.util.regex.Pattern; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java index 47cce256d5087..85d5b75d6f359 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java @@ -10,7 +10,7 @@ import java.util.TreeMap; import java.util.function.BiConsumer; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java index d354ec8261946..b8ac4d7e170b5 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java index 328b4ae2112c5..d9046681b8291 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedHashMap; /** * QuarkusMultivaluedHashMap without the bug in put/putAll that leaks external mutable storage into our storage. diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java index 501b2914a0bce..aa9b25c19b829 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * MultivaluedMap with extra operations diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/RestMediaType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/RestMediaType.java index 215fa1b28aad7..b2bd923af2233 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/RestMediaType.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/RestMediaType.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.common.util; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * Extended media types in Resteasy Reactive. diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java index 226c05613a608..9b34b68e1caaa 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * A representation of a server side media type. diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java index a23cc99023ec5..f3cd5b114b0e1 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.regex.Pattern; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * Utilities for dealing with URLs diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java index a7b67dbbe998f..1bea68f3f5a35 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java @@ -7,10 +7,10 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** - * Unmodifiable implementation of {@link javax.ws.rs.core.MultivaluedMap} interface + * Unmodifiable implementation of {@link jakarta.ws.rs.core.MultivaluedMap} interface * * @author Martin Stefanko * @version $Revision: 1 $ diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java index 279bdccb98ebf..431afbc3f7964 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java @@ -4,8 +4,8 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate b/independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.RuntimeDelegate similarity index 100% rename from independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate rename to independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.RuntimeDelegate diff --git a/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java b/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java index 41bde08867470..aec7374b98d36 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/test/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImplTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/common/types/pom.xml b/independent-projects/resteasy-reactive/common/types/pom.xml index 640cff7c72218..b7f19951dc69c 100644 --- a/independent-projects/resteasy-reactive/common/types/pom.xml +++ b/independent-projects/resteasy-reactive/common/types/pom.xml @@ -15,8 +15,8 @@ - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 2d95530ce9c29..4a0ee489451c4 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -35,39 +35,44 @@ + 1.0.0 + 5.0.0 + 2.1.1 + 3.1.0 + 4.0.0 + 1.1.1 UTF-8 11 11 11 - 2.0.2 + 4.0.1 3.0.5 1.12.12 5.9.2 3.8.7 3.24.2 3.5.0.Final - 1.3.5 + 2.1.1 1.6.0.Final - 2.2.3 + 3.0.0 3.0.0-M8 1.6.8 - 2.0.1.Final - 1.1.6 - 1.9.0 + 2.1.0 1.13.2 4.3.5 4.5.1 1.0.0.Final - 2.0.0.Final 2.14.2 1.3.0 - 2.0.2 - 1.0.11 - 1.0.2 + 3.0.2 + 3.0.2 + 3.0.0 4.2.0 - 2.25.0 + 3.0.0 + 1.0.4 + 1.0.0 3.4 @@ -155,6 +160,11 @@ jakarta.enterprise.cdi-api ${jakarta.enterprise.cdi-api.version} + + jakarta.json + jakarta.json-api + ${jakarta.json-api.version} + io.smallrye @@ -184,25 +194,14 @@ ${yasson.version} - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${jboss-jaxrs-api_2.1_spec.version} - - - org.glassfish - jakarta.json - ${jakarta.json.version} + org.eclipse.parsson + parsson + ${parsson.version} jakarta.json.bind jakarta.json.bind-api ${jakarta.json.bind-api.version} - - - jakarta.json - jakarta.json-api - - io.vertx @@ -220,11 +219,22 @@ ${vertx.version} + + org.reactivestreams + reactive-streams + ${reactive-streams.version} + + io.smallrye.reactive mutiny ${mutiny.version} + + io.smallrye.reactive + mutiny-zero-flow-adapters + ${mutiny-zero.version} + io.smallrye.reactive smallrye-mutiny-vertx-core @@ -352,16 +362,21 @@ pom import - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${jboss-jaxb-api_2.3_spec.version} - jakarta.validation jakarta.validation-api ${jakarta.validation-api.version} + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} + diff --git a/independent-projects/resteasy-reactive/server/jackson/pom.xml b/independent-projects/resteasy-reactive/server/jackson/pom.xml index 742656d2106aa..152416c4b6f01 100644 --- a/independent-projects/resteasy-reactive/server/jackson/pom.xml +++ b/independent-projects/resteasy-reactive/server/jackson/pom.xml @@ -58,8 +58,8 @@ commons-logging-jboss-logging - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api jakarta.validation diff --git a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java index dbf2cd8b8b91c..831a80d23490d 100644 --- a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonBasicMessageBodyReader.java @@ -5,10 +5,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.providers.serialisers.AbstractJsonMessageBodyReader; import org.jboss.resteasy.reactive.common.util.EmptyInputStream; diff --git a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java index 4b84d785a6c03..d5e9f631a2b17 100644 --- a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java +++ b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.server.StreamingOutputStream; diff --git a/independent-projects/resteasy-reactive/server/jsonb/pom.xml b/independent-projects/resteasy-reactive/server/jsonb/pom.xml index 61859d2038764..5084266ca6829 100644 --- a/independent-projects/resteasy-reactive/server/jsonb/pom.xml +++ b/independent-projects/resteasy-reactive/server/jsonb/pom.xml @@ -22,27 +22,10 @@ org.eclipse yasson - - - - org.glassfish - jakarta.json - - - jakarta.json - jakarta.json-api - - jakarta.json.bind jakarta.json.bind-api - - - jakarta.json - jakarta.json-api - - org.jboss.shrinkwrap @@ -79,8 +62,8 @@ commons-logging-jboss-logging - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api jakarta.validation diff --git a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java index 196fb2cd05b2b..02e018b22c155 100644 --- a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyReader.java @@ -5,12 +5,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.inject.Inject; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.inject.Inject; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.providers.serialisers.AbstractJsonMessageBodyReader; import org.jboss.resteasy.reactive.common.util.StreamUtil; diff --git a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java index e4ce7e30f5e4d..4c75ad78f294b 100644 --- a/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/jsonb/src/main/java/org/jboss/resteasy/reactive/server/jsonb/JsonbMessageBodyWriter.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.inject.Inject; -import javax.json.bind.Jsonb; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.inject.Inject; +import jakarta.json.bind.Jsonb; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.providers.serialisers.JsonMessageBodyWriterUtil; import org.jboss.resteasy.reactive.server.NoopCloseAndFlushOutputStream; diff --git a/independent-projects/resteasy-reactive/server/processor/pom.xml b/independent-projects/resteasy-reactive/server/processor/pom.xml index e98a6d4058c3a..6eee986b3064e 100644 --- a/independent-projects/resteasy-reactive/server/processor/pom.xml +++ b/independent-projects/resteasy-reactive/server/processor/pom.xml @@ -32,8 +32,8 @@ resteasy-reactive-common-processor - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api jakarta.enterprise diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java index 0463895218832..b93204e85a9c9 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ResteasyReactiveDeploymentManager.java @@ -17,7 +17,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java index cae5bc7227def..155c8f6f04f76 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.processor; -import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.DATE_FORMAT; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.INSTANT; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JAX_RS_ANNOTATIONS_FOR_FIELDS; @@ -37,9 +37,9 @@ import java.util.function.Supplier; import java.util.regex.PatternSyntaxException; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; @@ -120,13 +120,13 @@ protected void addWriterForType(AdditionalWriters additionalWriters, Type paramT if (dotName.equals(JSONP_JSON_VALUE) || dotName.equals(JSONP_JSON_NUMBER) || dotName.equals(JSONP_JSON_STRING)) { - additionalWriters.add(ServerJsonValueHandler.class, APPLICATION_JSON, javax.json.JsonValue.class); + additionalWriters.add(ServerJsonValueHandler.class, APPLICATION_JSON, jakarta.json.JsonValue.class); } else if (dotName.equals(JSONP_JSON_ARRAY)) { - additionalWriters.add(ServerJsonArrayHandler.class, APPLICATION_JSON, javax.json.JsonArray.class); + additionalWriters.add(ServerJsonArrayHandler.class, APPLICATION_JSON, jakarta.json.JsonArray.class); } else if (dotName.equals(JSONP_JSON_OBJECT)) { - additionalWriters.add(ServerJsonObjectHandler.class, APPLICATION_JSON, javax.json.JsonObject.class); + additionalWriters.add(ServerJsonObjectHandler.class, APPLICATION_JSON, jakarta.json.JsonObject.class); } else if (dotName.equals(JSONP_JSON_STRUCTURE)) { - additionalWriters.add(ServerJsonStructureHandler.class, APPLICATION_JSON, javax.json.JsonStructure.class); + additionalWriters.add(ServerJsonStructureHandler.class, APPLICATION_JSON, jakarta.json.JsonStructure.class); } } @@ -135,13 +135,13 @@ protected void addReaderForType(AdditionalReaders additionalReaders, Type paramT if (dotName.equals(JSONP_JSON_NUMBER) || dotName.equals(JSONP_JSON_VALUE) || dotName.equals(JSONP_JSON_STRING)) { - additionalReaders.add(ServerJsonValueHandler.class, APPLICATION_JSON, javax.json.JsonValue.class); + additionalReaders.add(ServerJsonValueHandler.class, APPLICATION_JSON, jakarta.json.JsonValue.class); } else if (dotName.equals(JSONP_JSON_ARRAY)) { - additionalReaders.add(ServerJsonArrayHandler.class, APPLICATION_JSON, javax.json.JsonArray.class); + additionalReaders.add(ServerJsonArrayHandler.class, APPLICATION_JSON, jakarta.json.JsonArray.class); } else if (dotName.equals(JSONP_JSON_OBJECT)) { - additionalReaders.add(ServerJsonObjectHandler.class, APPLICATION_JSON, javax.json.JsonObject.class); + additionalReaders.add(ServerJsonObjectHandler.class, APPLICATION_JSON, jakarta.json.JsonObject.class); } else if (dotName.equals(JSONP_JSON_STRUCTURE)) { - additionalReaders.add(ServerJsonStructureHandler.class, APPLICATION_JSON, javax.json.JsonStructure.class); + additionalReaders.add(ServerJsonStructureHandler.class, APPLICATION_JSON, jakarta.json.JsonStructure.class); } else if (dotName.equals(MULTI_VALUED_MAP)) { additionalReaders.add(ServerFormUrlEncodedProvider.class, APPLICATION_FORM_URLENCODED, MultivaluedMap.class); diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java index 60ddd874a0b23..878d38bfadaa6 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/exceptionmappers/ServerExceptionMapperGenerator.java @@ -26,11 +26,11 @@ import java.util.function.BiFunction; import java.util.function.Predicate; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Response; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Response; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java index 2c99a7eaac714..0758a7ae43b2a 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/CustomFilterGenerator.java @@ -19,17 +19,17 @@ import java.util.Set; import java.util.function.Predicate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Response; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; @@ -172,7 +172,7 @@ private String generateRequestFilterForSuspendedMethod(MethodInfo targetMethod, } /** - * Generates an implementation of {@link javax.ws.rs.container.ContainerRequestFilter} that delegates to the method + * Generates an implementation of {@link jakarta.ws.rs.container.ContainerRequestFilter} that delegates to the method * annotated with {@code @ServerRequestFilter}. *

    * An example of the generated code is: @@ -409,7 +409,7 @@ private String generateResponseFilterForSuspendedMethod(MethodInfo targetMethod, } /** - * Generates an implementation of {@link javax.ws.rs.container.ContainerResponseFilter} that delegates to the method + * Generates an implementation of {@link jakarta.ws.rs.container.ContainerResponseFilter} that delegates to the method * annotated with {@code @ServerResponseFilter}. *

    * An example of the generated code is: diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java index afdbe40f27d42..2b09394400c7c 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/filters/FilterFeature.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java index b011d4e002eec..89e7a3a547d32 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/FormDataOutputMapperGenerator.java @@ -6,7 +6,7 @@ import java.lang.reflect.Modifier; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationValue; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java index 629d204176390..ee673fe40e8ad 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/GeneratedHandlerMultipartReturnTypeIndexerExtension.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java index d04a8d4133af4..5cf0e9ce56ad4 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java @@ -2,6 +2,7 @@ import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COMPLETABLE_FUTURE; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COMPLETION_STAGE; +import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.LEGACY_PUBLISHER; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.MULTI; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PUBLISHER; import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.UNI; @@ -32,7 +33,7 @@ public List scan(MethodInfo method, ClassInfo actualEndp return Collections.singletonList(new FixedHandlerChainCustomizer(new UniResponseHandler(), HandlerChainCustomizer.Phase.AFTER_METHOD_INVOKE)); } - if (returnTypeName.equals(MULTI) || returnTypeName.equals(PUBLISHER)) { + if (returnTypeName.equals(MULTI) || returnTypeName.equals(PUBLISHER) || returnTypeName.equals(LEGACY_PUBLISHER)) { return Collections.singletonList(new FixedHandlerChainCustomizer(new PublisherResponseHandler(), HandlerChainCustomizer.Phase.AFTER_METHOD_INVOKE)); } @@ -43,6 +44,7 @@ public List scan(MethodInfo method, ClassInfo actualEndp public boolean isMethodSignatureAsync(MethodInfo method) { DotName returnTypeName = method.returnType().name(); return returnTypeName.equals(COMPLETION_STAGE) || returnTypeName.equals(COMPLETABLE_FUTURE) || - returnTypeName.equals(UNI) || returnTypeName.equals(MULTI) || returnTypeName.equals(PUBLISHER); + returnTypeName.equals(UNI) || returnTypeName.equals(MULTI) || returnTypeName.equals(PUBLISHER) || + returnTypeName.equals(LEGACY_PUBLISHER); } } diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java index ae69d399728f5..fc21e1cdb1398 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ClassInjectorTransformer.java @@ -9,10 +9,10 @@ import java.util.Map.Entry; import java.util.function.BiFunction; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.FieldInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java index 44d5ebdf54a0b..4c982d005a34b 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.function.Function; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java index 503fe2bda9b91..7cfd3f09e6b0b 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java @@ -5,8 +5,8 @@ import java.util.Set; import java.util.function.Function; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.core.Feature; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.core.Feature; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java index 648ff420151dc..2c6f8e2654396 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.function.Function; -import javax.ws.rs.Priorities; +import jakarta.ws.rs.Priorities; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java index bf6706327c8fb..e39eec64cc929 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/util/ResteasyReactiveServerDotNames.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.processor.util; -import javax.ws.rs.core.Context; +import jakarta.ws.rs.core.Context; import org.jboss.jandex.DotName; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/runtime/pom.xml b/independent-projects/resteasy-reactive/server/runtime/pom.xml index d4b3ef4d74279..0e8f945c40561 100644 --- a/independent-projects/resteasy-reactive/server/runtime/pom.xml +++ b/independent-projects/resteasy-reactive/server/runtime/pom.xml @@ -24,8 +24,8 @@ jakarta.enterprise.cdi-api - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java index 00744a8ba2dd1..b7c32871c1607 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java @@ -5,15 +5,15 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.UriInfo; /** - * When used on a method, then an implementation of {@link javax.ws.rs.ext.ExceptionMapper} is generated + * When used on a method, then an implementation of {@link jakarta.ws.rs.ext.ExceptionMapper} is generated * that calls the annotated method with the proper arguments. * * When the annotation is placed on a method that is not a JAX-RS Resource class, the method handles exceptions in global @@ -24,7 +24,7 @@ * that JAX-RS Resource class. * Methods in a JAX-RS class annotated with this annotation will be used first when determining how to handle a thrown * exception. - * This means that these methods take precedence over the global {@link javax.ws.rs.ext.ExceptionMapper} classes. + * This means that these methods take precedence over the global {@link jakarta.ws.rs.ext.ExceptionMapper} classes. * * In addition to the exception being handled, an annotated method can also declare any of the following * parameters (in any order): diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java index 8e60ebb805a6d..168378e52f6ba 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java @@ -5,18 +5,18 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.UriInfo; import io.smallrye.common.annotation.Blocking; /** - * When used on a method, then an implementation of {@link javax.ws.rs.container.ContainerRequestFilter} is generated + * When used on a method, then an implementation of {@link jakarta.ws.rs.container.ContainerRequestFilter} is generated * that calls the annotated method with the proper arguments *

    * The idea behind using this is to make it much to write a {@code ServerRequestFilter} as all the necessary information diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java index 79058d909f7d4..a12043ec3a75f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java @@ -5,14 +5,14 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.UriInfo; /** - * When used on a method, then an implementation of {@link javax.ws.rs.container.ContainerResponseContext} is generated + * When used on a method, then an implementation of {@link jakarta.ws.rs.container.ContainerResponseContext} is generated * that calls the annotated method with the proper arguments * * The idea behind using this is to make it much to write a {@code ServerResponseFilter} as all the necessary information diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java index 0077806d0053c..a9fb649604aa7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java @@ -2,7 +2,7 @@ import java.lang.reflect.Method; -import javax.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.container.ResourceInfo; /** * Type that can be injected into places where ResourceInfo can. diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java index e621d5d8b0bde..c2cdb33951052 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.spi.AsyncExceptionMapperContext; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java index 1764ea2834e35..364cd328eb911 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.function.Supplier; -import javax.ws.rs.core.Application; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java index 94de9f5156324..043ba32cad7c2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java @@ -5,7 +5,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig; import org.jboss.resteasy.reactive.common.model.ResourceClass; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java index e033783ef1d5e..c219865d5efa8 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java @@ -3,7 +3,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.spi.ContentType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java index 82ad1634b37a5..0203556f372e9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public interface LazyResponse { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java index 81847f39a140d..7e777846d6f50 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java @@ -17,16 +17,16 @@ import java.util.concurrent.Executor; import java.util.regex.Matcher; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.common.NotImplementedYet; import org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java index a72022cea3288..2812005bc17ec 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RuntimeExceptionMapper.java @@ -13,9 +13,9 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.ResteasyReactiveClientProblem; @@ -76,11 +76,11 @@ public void mapException(Throwable throwable, ResteasyReactiveRequestContext con } // we match superclasses only if not a WebApplicationException according to spec 3.3.4 Exceptions - Map.Entry> entry = getExceptionMapper( + Map.Entry> entry = getExceptionMapper( (Class) klass, context, throwable); if (entry != null) { - javax.ws.rs.ext.ExceptionMapper exceptionMapper = entry.getValue(); + jakarta.ws.rs.ext.ExceptionMapper exceptionMapper = entry.getValue(); Throwable mappedException = entry.getKey(); context.requireCDIRequestScope(); if (exceptionMapper instanceof ResteasyReactiveAsyncExceptionMapper) { @@ -201,14 +201,14 @@ public void addExceptionMapper(Class exceptionClass, Re * application * has been configured to unwrap certain exceptions. */ - public Map.Entry> getExceptionMapper( + public Map.Entry> getExceptionMapper( Class clazz, ResteasyReactiveRequestContext context, T throwable) { Map, ResourceExceptionMapper> classExceptionMappers = getClassExceptionMappers( context); if ((classExceptionMappers != null) && !classExceptionMappers.isEmpty()) { - Map.Entry> result = doGetExceptionMapper(clazz, + Map.Entry> result = doGetExceptionMapper(clazz, classExceptionMappers, throwable); if (result != null) { return result; @@ -226,7 +226,7 @@ private Map, ResourceExceptionMapper Map.Entry> doGetExceptionMapper( + private Map.Entry> doGetExceptionMapper( Class clazz, Map, ResourceExceptionMapper> mappers, Throwable throwable) { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java index 37ed188de5536..96bfe273a3767 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java index 6123dde7cbed3..bd093f5c242fd 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java @@ -21,16 +21,16 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.PathPart; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java index 24de690d468c9..200dc82a38748 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java @@ -9,12 +9,12 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.SseEvent; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.SseEvent; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.util.CommonSseUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java index 8f31bd6bbbe4e..ecd59301f757b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java @@ -7,11 +7,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.server.StreamingOutputStream; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java index 39016664ea194..27671954e1295 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/DefaultFileUpload.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.nio.file.Path; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.multipart.FileUpload; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java index 39e499454e13d..15e9e7436f4a8 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/FormEncodedDataDefinition.java @@ -7,9 +7,9 @@ import java.nio.charset.StandardCharsets; import java.util.Set; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java index 9d3465317a90d..b368678792aa8 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultiPartParserDefinition.java @@ -20,10 +20,10 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.CompletionCallback; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java index 3855132e4fdc4..870a8732c7839 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartMessageBodyWriter.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core.multipart; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; import java.io.File; import java.io.IOException; @@ -15,12 +15,12 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.core.Serialisers; import org.jboss.resteasy.reactive.common.reflection.ReflectionBeanFactoryCreator; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java index 34cb6b8582cc4..9f8371d33bd1f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java @@ -17,11 +17,11 @@ import java.util.Deque; import java.util.List; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotSupportedException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotSupportedException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyReader; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.Encode; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java index 501f9fda27b0b..515af349d12e1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java @@ -1,19 +1,19 @@ package org.jboss.resteasy.reactive.server.core.parameters; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Providers; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Providers; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java index f2daaadc2bcb9..9143960034c72 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core.parameters; -import javax.ws.rs.core.Cookie; +import jakarta.ws.rs.core.Cookie; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java index d641487472487..ee4502358afe1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core.parameters; -import javax.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.CompletionCallback; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MultipartFormParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MultipartFormParamExtractor.java index 3b2a4b0473963..bad25c138ad2f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MultipartFormParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MultipartFormParamExtractor.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.multipart.FileUpload; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java index c80d860de8eb7..36af230ace81a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java @@ -3,7 +3,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java index abecc2bfad6c0..84f9e793affce 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java @@ -3,8 +3,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider; import org.jboss.resteasy.reactive.server.model.ParamConverterProviders; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java index 0ec8ebb55c27b..e3da35de242c6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/reflection/ReflectiveContextInjectedBeanFactory.java @@ -14,10 +14,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Inject; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; +import jakarta.inject.Inject; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; import org.jboss.resteasy.reactive.server.core.parameters.ContextParamExtractor; @@ -82,7 +82,7 @@ public ReflectiveContextInjectedBeanFactory(Constructor constructor) { constructorParams = new ArrayList<>(); for (var i : constructor.getParameterTypes()) { //assume @Contextual object - if (i.isInterface() && (i.getName().startsWith("javax.ws.rs") || i.getName().startsWith("jakarta.ws.rs"))) { + if (i.isInterface() && (i.getName().startsWith("jakarta.ws.rs") || i.getName().startsWith("jakarta.ws.rs"))) { var val = extractContextParam(i); constructorParams.add(() -> val); } else if (i.isAnnotationPresent(QueryParam.class)) { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java index 81d5a538ef116..b36ff839e34ca 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.MediaType; /** * @author Pascal S. de Kloe diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java index 2a6055b1ce441..13cd925089ae1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.core.request; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; /** * @author Pascal S. de Kloe diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java index 5619f2d2515ba..28f8cb5ba0bc5 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java @@ -5,8 +5,8 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Variant; /** * {@link Variant} selection. diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java index 3c33a226520b4..9984cff1b76b9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import java.math.MathContext; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * A individual variant quality bean for the RVSA (Remote Variant Selection Algorithm). diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java index 46660abb8a303..452a083fce005 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.util.List; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.server.core.EncodedMediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java index 48c1e7ee3bb9b..2fe7811f81e9c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java @@ -7,7 +7,7 @@ /** * An interface that can be used to write out an entity. * - * In practical terms these represent a set of {@link javax.ws.rs.ext.MessageBodyWriter} + * In practical terms these represent a set of {@link jakarta.ws.rs.ext.MessageBodyWriter} * implementations. As must as possible the implementations are resolved at build time, however * the spec does allow for dynamic behaviour, which is abstracted behind this interface. * diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java index 6a8559633eeb2..f54c8b9ff6272 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java index 8aa3d27ab8f9a..ba43b12513abf 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java index 7e1704ccb9c1f..a7f438a74b650 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.util.Map; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java index 397abf08f071f..dd961026e73ef 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.util.Map; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java index 9206d4f93e0b8..9cd376ea8f7af 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java @@ -13,10 +13,10 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Feature; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Feature; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.ResourceClass; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java index 89775a73b4620..4ff5dc74e2c2a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java @@ -10,11 +10,11 @@ import java.util.TreeMap; import java.util.function.Consumer; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.HasPriority; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java index 39fc1b4836e3c..9de762ffa31ec 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java @@ -25,11 +25,11 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import javax.ws.rs.RuntimeType; -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 jakarta.ws.rs.RuntimeType; +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 org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java index d24d14efad005..e9976d54e82e6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/exceptionmappers/AsyncExceptionMappingUtil.java @@ -3,7 +3,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestResponse; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java index 14d71f7c9b4e3..135fe4f9c2b36 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/FilterUtil.java @@ -4,7 +4,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java index 31addad5355cf..db5760e53b71f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/filters/PreventAbortResteasyReactiveContainerRequestContext.java @@ -8,14 +8,14 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; /** * This class is used to prevent calls to 'abortWith' which could lead to unexpected results in generated diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java index 305a344bf062d..fc31b9390cc37 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CacheControlHandler.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.handlers; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.reactive.common.util.ExtendedCacheControl; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java index 7ebef12cfbdba..d7b04843a9240 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java @@ -8,14 +8,14 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.NotAcceptableException; -import javax.ws.rs.NotAllowedException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.NotSupportedException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.NotAcceptableException; +import jakarta.ws.rs.NotAllowedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.NotSupportedException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.headers.MediaTypeHeaderDelegate; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java index 361ae89e90315..78ca786ccef8d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java @@ -3,11 +3,11 @@ import java.util.List; import java.util.Locale; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.server.core.EncodedMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java index 8b1aa72fb1502..74c78b2d61bc8 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java @@ -7,7 +7,7 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java index af3635aa26a7b..1fa795c529bc5 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java index 383b95b3931b6..f29905d2a194b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java index 37e6dbf5ec419..0e7bb9105a22e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java @@ -3,9 +3,9 @@ import java.util.Collection; import java.util.function.BiConsumer; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.model.ParameterType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java index 46518a452d4af..5003c814a9f6f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import javax.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.CompletionCallback; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java index 45389d6c2ca0e..d10f6fcfdaecd 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java @@ -6,12 +6,15 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.OutboundSseEvent; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.RestMediaType; @@ -23,9 +26,8 @@ import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer.Phase; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; import org.jboss.resteasy.reactive.server.spi.StreamingResponse; -import org.reactivestreams.Publisher; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; + +import mutiny.zero.flow.adapters.AdaptersToFlow; /** * This handler is used to push streams of data to the client. @@ -246,8 +248,12 @@ public void handle(ResteasyReactiveRequestContext requestContext) @Override public void handle(ResteasyReactiveRequestContext requestContext) throws Exception { // FIXME: handle Response with entity being a Multi - if (requestContext.getResult() instanceof Publisher) { - Publisher result = (Publisher) requestContext.getResult(); + Object requestContextResult = requestContext.getResult(); + if (requestContextResult instanceof org.reactivestreams.Publisher) { + requestContextResult = AdaptersToFlow.publisher((org.reactivestreams.Publisher) requestContextResult); + } + if (requestContextResult instanceof Publisher) { + Publisher result = (Publisher) requestContextResult; // FIXME: if we make a pretend Response and go through the normal route, we will get // media type negotiation and fixed entity writer set up, perhaps it's better than // cancelling the normal route? diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java index 701946a95ca5c..768e1612ab778 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java @@ -6,16 +6,16 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotSupportedException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.NoContentException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotSupportedException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NoContentException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.ReaderInterceptor; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java index 3ce59903c08d5..0b3529f4f539d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java @@ -9,9 +9,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.CompletionCallback; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.mapping.RequestMapper; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java index 6e19c70d8ae4a..a2863b4cc8f6f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.handlers; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerRequestFilter; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java index f98b0238e65f3..a7a678527e228 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java index 09b1e06eb60d7..8542d3cf330f9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java index bfbd917ee9547..6f554602ac65f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.handlers; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java index 4754a7fd54e46..447b4a792f617 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.jboss.resteasy.reactive.server.core.Deployment; import org.jboss.resteasy.reactive.server.core.RequestContextFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java index 90b717466b668..6c1e712350e67 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java @@ -2,14 +2,14 @@ import java.util.List; -import javax.ws.rs.NotAcceptableException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.NotAcceptableException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java index 829306f0baa60..a096e6a21257f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java @@ -1,19 +1,19 @@ package org.jboss.resteasy.reactive.server.injection; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.sse.Sse; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.sse.Sse; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java index 34d606c08fcb6..a28c2e17b1e1d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.Objects; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.InterceptorContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.InterceptorContext; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.ServerSerialisers; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java index 07ababd9e8ad0..23f4964be8ea0 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java @@ -10,14 +10,14 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.ws.rs.ServiceUnavailableException; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.CompletionCallback; -import javax.ws.rs.container.ConnectionCallback; -import javax.ws.rs.container.TimeoutHandler; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.CompletionCallback; +import jakarta.ws.rs.container.ConnectionCallback; +import jakarta.ws.rs.container.TimeoutHandler; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java index d893b93f6416e..8866918d4c8bb 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java @@ -8,13 +8,13 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java index 7c8cee24a508d..57429cd9d9be1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java @@ -9,16 +9,16 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Link.Builder; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Link.Builder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.StatusType; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java index 2e575e65ba3f6..081bf97757a34 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.ContextResolver; public class ContextResolverDelegate implements ContextResolver { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java index a570e9d11b291..39cfbd45379f5 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java @@ -2,8 +2,8 @@ import java.util.function.Function; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; import org.jboss.resteasy.reactive.common.model.InterceptorContainer; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java index 5142ed59ca227..1bbf12ffad539 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java @@ -8,16 +8,16 @@ import java.util.Set; import java.util.function.Function; -import javax.annotation.Priority; -import javax.ws.rs.NameBinding; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.WriterInterceptor; +import jakarta.annotation.Priority; +import jakarta.ws.rs.NameBinding; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.WriterInterceptor; import org.jboss.resteasy.reactive.common.core.UnmanagedBeanFactory; import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java index 8177b3e08c51c..b6cb4e3500d44 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java @@ -6,10 +6,10 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.headers.HeaderUtil; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java index 0b2705f1a2759..2960bd2dd9929 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java @@ -3,11 +3,11 @@ import java.lang.reflect.Type; import java.util.Objects; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.SseEvent; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.SseEvent; public class OutboundSseEventImpl implements OutboundSseEvent { private final String name; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java index ac7e8a9a4de4d..5ee55c58cd475 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Providers; import org.jboss.resteasy.reactive.server.core.Deployment; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java index 26573557b73ae..6a8d90bab2d68 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java @@ -6,14 +6,14 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.NotSupportedException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.ReaderInterceptorContext; +import jakarta.ws.rs.NotSupportedException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.ReaderInterceptor; +import jakarta.ws.rs.ext.ReaderInterceptorContext; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java index d00022cf00c00..9a33e0ea8c7e7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java @@ -4,12 +4,12 @@ import java.util.Date; import java.util.List; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder; import org.jboss.resteasy.reactive.common.util.DateUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java index 6f9e1467390f3..74a4cc7e1f14c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.jaxrs; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.container.ResourceContext; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.container.ResourceContext; public class ResourceContextImpl implements ResourceContext { public static ResourceContextImpl INSTANCE = new ResourceContextImpl(); diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java index 1c63e1cd14415..c4c2847152c43 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java @@ -3,8 +3,8 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder; import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java index 54aff4e66ecaf..21d74d4b9f828 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java @@ -3,7 +3,7 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.jaxrs.AbstractRestResponseBuilder; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java index 1700f89b43a93..7088c56f96d21 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java @@ -9,9 +9,9 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.SseBroadcaster; -import javax.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.SseEventSink; public class SseBroadcasterImpl implements SseBroadcaster { @@ -105,13 +105,20 @@ private void checkClosed() { @Override public synchronized void close() { + close(true); + } + + @Override + public synchronized void close(boolean cascading) { if (isClosed) { return; } isClosed = true; - for (SseEventSink sink : sinks) { - // this will in turn fire close events to our listeners - sink.close(); + if (cascading) { + for (SseEventSink sink : sinks) { + // this will in turn fire close events to our listeners + sink.close(); + } } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java index faed79cdc9788..6b8080faeb067 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java @@ -4,8 +4,8 @@ import java.util.concurrent.CompletionStage; import java.util.function.Consumer; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.core.SseUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java index 590fbac392cd3..18c9245b3e852 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.jaxrs; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseBroadcaster; public class SseImpl implements Sse { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java index f6a55ea04f3cd..a470d07b61f76 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java @@ -8,10 +8,10 @@ import java.util.List; import java.util.Map.Entry; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; import org.jboss.resteasy.reactive.common.util.PathSegmentImpl; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java index f822e44002d6e..3e048db93f0f9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java @@ -6,15 +6,15 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -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.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +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.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java index 1af8e2ef6c0bb..eb19586110723 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper; import org.jboss.resteasy.reactive.common.util.ServerMediaType; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java index c67ade81d73af..8b6c672f0c955 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java @@ -7,8 +7,8 @@ import java.util.Map; import java.util.function.Function; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.ContextResolver; import org.jboss.resteasy.reactive.common.model.ResourceContextResolver; import org.jboss.resteasy.reactive.common.util.MediaTypeHelper; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java index 930ec633e64ae..fc75b35d05289 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java @@ -4,13 +4,13 @@ import java.util.List; import java.util.function.Function; -import javax.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.DynamicFeature; import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature; import org.jboss.resteasy.reactive.spi.BeanFactory; /** - * Container for {@link javax.ws.rs.container.DynamicFeature} + * Container for {@link jakarta.ws.rs.container.DynamicFeature} */ public class DynamicFeatures { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java index bf46d48c59d3e..a8fbfc3cd476d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.function.Function; -import javax.ws.rs.core.Feature; +import jakarta.ws.rs.core.Feature; import org.jboss.resteasy.reactive.common.model.ResourceFeature; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java index b86547d71ff15..e0339f7b43116 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.function.Supplier; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.common.model.ResourceClass; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java index e2b510467e183..b78950348b2b9 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.function.Function; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.ParamConverterProvider; import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider; import org.jboss.resteasy.reactive.spi.BeanFactory; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/FormValue.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/FormValue.java index 10f89cb450cf9..32c5a9672b5a1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/FormValue.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/FormValue.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.multipart; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * Represents one part of a multipart request diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartFormDataOutput.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartFormDataOutput.java index d3e049028d4c0..98df68f045e4a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartFormDataOutput.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartFormDataOutput.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * Used when a Resource method needs to return a multipart output diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartPartReadingException.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartPartReadingException.java index fed9153cfd280..410fc4c3d335d 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartPartReadingException.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/MultipartPartReadingException.java @@ -1,11 +1,12 @@ package org.jboss.resteasy.reactive.server.multipart; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; /** * Exception thrown when some part of the multipart input cannot be read using the appropriate - * {@link javax.ws.rs.ext.MessageBodyReader}. - * This exception is useful to application because it can be by an {@link javax.ws.rs.ext.ExceptionMapper} in order to customize + * {@link jakarta.ws.rs.ext.MessageBodyReader}. + * This exception is useful to application because it can be by an {@link jakarta.ws.rs.ext.ExceptionMapper} in order to + * customize * the input error handling. */ public class MultipartPartReadingException extends BadRequestException { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/PartItem.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/PartItem.java index bcb20781354bc..d5d13518d6c8c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/PartItem.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/multipart/PartItem.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.multipart; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java index 2be468dd0a7bf..6e185f3436020 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.BooleanMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java index 1c1072159d824..ffb0b9f4e49c0 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.ByteArrayMessageBodyHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java index ce54d00bc73d6..839f18b2a6402 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.CharArrayMessageBodyHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java index e96f0c7d8dc7e..2c7bd368d02e6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.CharacterMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java index 51779b09fe86e..862b2871b457a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java index cb8fb60eca0a2..aa974beede41f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java @@ -4,10 +4,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.FileBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java index 6e820b21eab73..08d8b26e0b3e6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFilePartBodyHandler.java @@ -3,10 +3,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.FilePart; import org.jboss.resteasy.reactive.common.providers.serialisers.FilePartBodyHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java index e5156e69a61c8..5462900467af4 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java @@ -4,13 +4,13 @@ import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.resteasy.reactive.common.providers.serialisers.MapAsFormUrlEncodedProvider; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java index e425943db55d2..8871210e400c3 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java @@ -5,8 +5,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.InputStreamMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java index 260f7c985d808..09e4683b3149f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.NumberMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java index 9978e13d19e60..0585d84426286 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathBodyHandler.java @@ -6,9 +6,9 @@ import java.lang.reflect.Type; import java.nio.file.Files; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.PathBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java index 0e5fe867bef72..ee3d8b282ac5a 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerPathPartBodyHandler.java @@ -6,9 +6,9 @@ import java.lang.reflect.Type; import java.nio.file.Files; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PathPart; import org.jboss.resteasy.reactive.common.providers.serialisers.PathPartBodyHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java index e1b6e2c8dc886..81d780b51b2a0 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java @@ -6,8 +6,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; import org.jboss.resteasy.reactive.common.providers.serialisers.ReaderBodyHandler; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java index 45564ddd73973..904af68642e41 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.StringMessageBodyHandler; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java index bf05713943b1c..8ea6a5ec31d3f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java @@ -3,10 +3,10 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; -import javax.json.JsonArray; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.json.JsonArray; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonArrayHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java index db5d1edac36cb..fcaa1d9091bc2 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java @@ -3,10 +3,10 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; -import javax.json.JsonObject; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.json.JsonObject; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonObjectHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java index 02d18b294ac33..ef055f5905fe4 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java @@ -3,11 +3,11 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; -import javax.json.JsonObject; -import javax.json.JsonStructure; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.json.JsonObject; +import jakarta.json.JsonStructure; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonStructureHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java index 0dfc64efef638..b75d0d68b8961 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java @@ -3,10 +3,10 @@ import java.io.ByteArrayOutputStream; import java.lang.reflect.Type; -import javax.json.JsonValue; -import javax.json.JsonWriter; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler; import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java index 4c33cbcf06391..310d15bdbd794 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.spi; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public interface AsyncExceptionMapperContext { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java index 33b3ec14bcc3c..5691507b78297 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.spi; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public interface ContentType { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java index cfb95ad8bcb9e..9001c19be97c1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.spi; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; /** * Allow ExceptionMapper classes that can use resume and suspend when attempting to convert diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java index 786d26a293796..e087f3e9719ef 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.spi; -import javax.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestContext; public interface ResteasyReactiveContainerRequestContext extends ContainerRequestContext { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java index 0df3b8685329f..0ad89f9438264 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; public interface ResteasyReactiveContainerRequestFilter extends ContainerRequestFilter { @Override diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java index 83c787552b729..80df206e19f4f 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.spi; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; public interface ResteasyReactiveContainerResponseFilter extends ContainerResponseFilter { @Override diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java index ddccb90e0785e..245b5404e85a6 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.spi; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; public interface ResteasyReactiveExceptionMapper extends ExceptionMapper { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java index f0505af02c6dd..5e8b3377e4d77 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java @@ -5,7 +5,7 @@ import java.lang.reflect.Type; import java.util.Set; -import javax.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.container.ResourceInfo; import org.jboss.resteasy.reactive.server.util.MethodId; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java index 0a71553cda9a0..379086517d63e 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyReader; public interface ServerMessageBodyReader extends MessageBodyReader { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java index 2ed5d0a0bd9a4..df8fa18ff0bb7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java @@ -4,9 +4,9 @@ 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.ext.MessageBodyWriter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.types.AllWriteableMarker; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java index 00b4b0afa342c..50fba8210e0da 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java @@ -3,8 +3,8 @@ import java.io.InputStream; import java.io.OutputStream; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.common.core.ResteasyReactiveCallbackContext; diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java index 99463f7a71be2..a4b001c8ded8b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java @@ -7,8 +7,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.MessageBodyWriter; import org.jboss.resteasy.reactive.common.util.ServerMediaType; import org.jboss.resteasy.reactive.server.handlers.ResourceRequestFilterHandler; diff --git a/independent-projects/resteasy-reactive/server/vertx/pom.xml b/independent-projects/resteasy-reactive/server/vertx/pom.xml index 9de116c3a5e0f..c6f0e316761de 100644 --- a/independent-projects/resteasy-reactive/server/vertx/pom.xml +++ b/independent-projects/resteasy-reactive/server/vertx/pom.xml @@ -32,8 +32,8 @@ jakarta.enterprise.cdi-api - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api org.jboss.shrinkwrap @@ -81,8 +81,8 @@ commons-logging-jboss-logging - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api jakarta.validation diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java index e3f9a68310b49..f1d7f01ddff7d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java @@ -5,8 +5,8 @@ import java.io.InterruptedIOException; import java.io.OutputStream; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.core.LazyResponse; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java index 084c6cf9f6153..a4f8ec0951bf4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap; import org.jboss.resteasy.reactive.server.core.Deployment; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java index 8b9f63fefff88..2262c937af40e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyAsyncFileMessageBodyWriter.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.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java index e2fbfccb92c26..6d1a4413c255a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerMutinyBufferMessageBodyWriter.java @@ -5,10 +5,10 @@ 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.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java index b498dcbcd397b..5205794a96367 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxAsyncFileMessageBodyWriter.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.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java index 91bd04e398a24..9f630716f4e7b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/serializers/ServerVertxBufferMessageBodyWriter.java @@ -5,10 +5,10 @@ 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.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java index 897194c8354e5..000b99cb11b9f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnApplicationTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java index 8775571568798..3355182c2c51c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnClassTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java index 1e68cde0e3352..49202504cff91 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/BothBlockingAndNonBlockingOnMethodTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java index cd6b1cd99b363..a7013e9c02601 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/hello") public class HelloResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java index 23df043ec3399..203872952890a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/InnerClassTest.java @@ -4,8 +4,8 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java index 558bbc21755ff..55d3b79b5640b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/MultipleHttpAnnotationsTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java index 500d8d5f93573..7fb9cf737c61a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnClassAndMethodsTest.java @@ -5,8 +5,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -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.server.processor.ResteasyReactiveDeploymentManager; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java index c3f5930891abe..74dfab3cc48f3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/CacheOnMethodsTest.java @@ -6,8 +6,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -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.server.processor.ResteasyReactiveDeploymentManager; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java index 48afad37bc61a..a762f5a6de6da 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnClassAndMethodsTest.java @@ -5,8 +5,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -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.NoCache; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java index 91b06978cd5dc..910245da3e124 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/cache/NoCacheOnMethodsTest.java @@ -6,8 +6,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -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.NoCache; import org.jboss.resteasy.reactive.server.processor.ResteasyReactiveDeploymentManager; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java index 6f75fc56aafa6..955d3b97c51b2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/FirstResource.java @@ -2,14 +2,14 @@ import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.removeStackTrace; -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.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +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.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java index 0761fa41eced3..fadb8a7f26b61 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/GlobalThrowableExceptionMapperTest.java @@ -5,10 +5,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java index 395e4ed0fb5d3..93474042f43ec 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/MyOtherExceptionMapper.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.customexceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java index 69d01d4d2f750..f204496b13215 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/PerClassThrowableExceptionMapperTest.java @@ -4,10 +4,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; import org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SecondResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SecondResource.java index 792331c4202f6..39200e2ab8be2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SecondResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SecondResource.java @@ -2,9 +2,9 @@ import static org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil.removeStackTrace; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("second") public class SecondResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SomeBean.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SomeBean.java index 36c2c5ca6618b..182413b0f8805 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SomeBean.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/SomeBean.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.customexceptions; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class SomeBean { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java index a7786814c3388..e56db2ec6a51d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UniExceptionMapper.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.customexceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java index 143a827249bb2..9c3544823f9b9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customexceptions/UnwrappedExceptionTest.java @@ -6,8 +6,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.jboss.jandex.IndexView; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java index 5140a4f6cf344..ef90d48e4e903 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AnotherValidNonBlockingFiltersTest.java @@ -5,18 +5,18 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java index bf97b5eba3281..61bcbbe2acd22 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/AssertContainerFilter.java @@ -5,10 +5,10 @@ import java.util.List; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Request; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Request; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java index 21a320893f1bd..78102b4e4881e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerRequestFilter.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java index bb4d89f917e71..9783223c02523 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomContainerResponseFilter.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersResource.java index 339b50492f863..c7b0c604031c5 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/CustomFiltersResource.java @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -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.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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; @Path("/custom") public class CustomFiltersResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java index 4c38e9a8e0eb3..fcfb3479e738e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/FilterWithPathParamsTest.java @@ -6,10 +6,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.ServerResponseFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/IllegalStateExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/IllegalStateExceptionMapper.java index e29c8c7d57e5b..290fceb3ab16f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/IllegalStateExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/IllegalStateExceptionMapper.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class IllegalStateExceptionMapper implements ExceptionMapper { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java index 7e69adc59bd09..07752f8e92308 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/InvalidNonBlockingFiltersTest.java @@ -5,14 +5,14 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java index de598d5d4b31e..dd6b48d8249ed 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/Metal.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.TYPE, ElementType.METHOD }) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java index 29cdb516803ca..b5202102af420 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/MetalFilter.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestContext; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java index 5c1933464c720..3ad8783475e50 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NoTargetTest.java @@ -5,16 +5,16 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java index c78781457f526..8c6e692c073eb 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/OptionalRequestFilter.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java index 62931637e24df..b5427d82a6f75 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ResponseFilter.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/SomeBean.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/SomeBean.java index ae2ff9dadc58d..d0185cfa24726 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/SomeBean.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/SomeBean.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class SomeBean { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniExceptionMapper.java index 6b591507cba91..c2f4e10e0973d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniExceptionMapper.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class UniExceptionMapper implements ExceptionMapper { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersResource.java index 9d518c417b432..c6f2aa0b48caa 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniFiltersResource.java @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -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.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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; @Path("uni") public class UniFiltersResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java index 921b55283c692..c3e77d3b1319a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseFilter.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseContext; import org.jboss.resteasy.reactive.server.ServerResponseFilter; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java index baf0fe6fcace4..2e819706fe97a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniResponseRequestFilter.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java index e07a5c1956d6a..57a479d54e365 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/UniVoidRequestFilter.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.customproviders; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.reactive.server.ServerRequestFilter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java index 5da56eba85a7b..812fba9a36c9d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/ValidNonBlockingFiltersTest.java @@ -5,17 +5,17 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.annotation.Priority; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java index 7606472896cd1..ad33392585b5a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/form/FormUrlencodedCorruptionTest.java @@ -5,12 +5,12 @@ import java.net.URLEncoder; -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.MultivaluedMap; +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.MultivaluedMap; import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java index b996daf921ddc..ec50f18b9c567 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java @@ -36,7 +36,7 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ChunkedHeaderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ChunkedHeaderTest.java index 3e94842869249..56e7365271623 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ChunkedHeaderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ChunkedHeaderTest.java @@ -4,9 +4,9 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; -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.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/CookiesTestResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/CookiesTestResource.java index 9b39209339342..928111eebfc28 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/CookiesTestResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/CookiesTestResource.java @@ -1,12 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.headers; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; @Path("/cookies") public class CookiesTestResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java index 8538b75f860eb..cba856df7aef3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/Dummy.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.headers; -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.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java index 0f178310db20d..92a42ddc12d86 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/headers/ResponseHeaderTest.java @@ -7,8 +7,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 org.jboss.resteasy.reactive.ResponseHeader; import org.jboss.resteasy.reactive.ResponseStatus; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java index 640d58e9a4704..178a09a9afdd9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/EndingSlashTest.java @@ -5,10 +5,10 @@ import java.util.function.Supplier; -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.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java index 7df30646bbb4d..19b93e6cdc5ca 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/GeneralResource.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.matching; -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; @Path("/hello") public class GeneralResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java index 6ebae6c90f795..04515573caab0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/MultipleProducesTest.java @@ -10,15 +10,15 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -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.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.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 org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/PathParamOverlapTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/PathParamOverlapTest.java index 7bada4e342a20..436f4d826c31e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/PathParamOverlapTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/PathParamOverlapTest.java @@ -5,10 +5,10 @@ import java.util.function.Supplier; -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.RestPath; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexResource.java index 98afa1a9d28d3..6eeed328d905d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/RegexResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.matching; -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("/regex") public class RegexResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/ResourceClassMergeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/ResourceClassMergeTest.java index b5ae2b66821cb..ce48b63fb8575 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/ResourceClassMergeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/ResourceClassMergeTest.java @@ -5,12 +5,12 @@ 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 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 org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java index f0d750c167409..c63047dbddf73 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SpecificResource.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.matching; -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; @Path("/hello/{id}/bar") public class SpecificResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java index ab9c9fd11b168..33caafc0416cd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/matching/SubresourceCustomRegexTest.java @@ -5,10 +5,10 @@ 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 jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java index e27abf4620632..6110352656512 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/CharsetTest.java @@ -6,10 +6,10 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -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.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java index cc6e1c4586653..355fab10257e7 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/ContentTypeCaseTest.java @@ -5,11 +5,11 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java index 148417f66a6d6..648fe613a186d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/InvalidContentTypeTest.java @@ -6,9 +6,9 @@ import java.util.function.Supplier; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java index ad510c836e2d0..7060e02fce126 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/MessageBodyWriteTest.java @@ -11,14 +11,14 @@ import java.util.Map; import java.util.function.Supplier; -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.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.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 org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java index 1a68b3cd6f8e8..0873e1688b1c7 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/mediatype/NoAcceptMultipleProducesTest.java @@ -12,13 +12,13 @@ import java.util.Map; import java.util.function.Supplier; -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.MediaType; -import javax.ws.rs.core.MultivaluedMap; -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.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java index 8afe63dd5133f..56dd88fe3b4ff 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/EchoResource.java @@ -2,11 +2,11 @@ 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 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.smallrye.common.annotation.NonBlocking; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java index 5f57aa010d1ac..24c57c44d27b0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormData.java @@ -3,7 +3,7 @@ import java.io.File; import java.nio.file.Path; -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/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java index 0aa6e50467ae3..6a6f47966aaed 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataBase.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -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/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java index d7c3580ce749e..9d9914f1732c2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataSameFileName.java @@ -4,7 +4,7 @@ import java.nio.file.Path; 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/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java index 176a77b613273..3dae8dc21ad95 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/FormDataWithAllUploads.java @@ -2,7 +2,7 @@ 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/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java index a5eaf0224fb79..77fe0766121f2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/InvalidEncodingTest.java @@ -5,12 +5,12 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import javax.ws.rs.BeanParam; -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.BeanParam; +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.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java index ed1183ce2a34d..afa75128a207b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java @@ -9,13 +9,13 @@ import java.nio.file.Files; import java.util.function.Supplier; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.PartType; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartFileContentTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartFileContentTypeTest.java index 93c4771f78959..53d42b51ecbd9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartFileContentTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartFileContentTypeTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.function.Supplier; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java index e024c8c65da9a..f21ca7ad09aaf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputFileResponse.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/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java index f4377899bb62c..3e139767d31fa 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResource.java @@ -3,10 +3,10 @@ import java.io.File; 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.jboss.resteasy.reactive.server.multipart.MultipartFormDataOutput; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java index e2ab7b14919cf..d9e5c3b7c20a2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputResponse.java @@ -2,8 +2,8 @@ import java.util.List; -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.reactive.PartType; import org.jboss.resteasy.reactive.RestForm; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java index fc27042f39599..bb3036215c2c5 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingBlockingEndpointsTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.equalTo; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java index f707508849656..dcee8d5296aea 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartOutputUsingReactiveEndpointTest.java @@ -2,11 +2,11 @@ import static org.junit.jupiter.api.Assertions.fail; -import javax.enterprise.inject.spi.DeploymentException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.inject.spi.DeploymentException; +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.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.multipart.other.OtherPackageFormDataBase; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java index 888aa1e0204dd..a2fea14336834 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResource.java @@ -3,14 +3,14 @@ import java.io.IOException; import java.nio.file.Files; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -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.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +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.jboss.resteasy.reactive.RestQuery; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java index 379fd4a158926..01fa7e9e33bc2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/MultipartResourceWithAllUploads.java @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -import javax.ws.rs.BeanParam; -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.BeanParam; +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.jboss.resteasy.reactive.multipart.FileUpload; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherFormDataBase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherFormDataBase.java index 04235428c6185..fd9ac81a96e78 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherFormDataBase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherFormDataBase.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; public class OtherFormDataBase { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java index ef632b8f8d15e..16bef8a3ed380 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/OtherMultipartResource.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart; -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.jboss.resteasy.reactive.MultipartForm; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java index 3935e4d6e3eaf..b2440505a49a4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java @@ -9,11 +9,11 @@ import java.nio.file.Paths; import java.util.function.Supplier; -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.jboss.resteasy.reactive.MultipartForm; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java index d07ba706aebe7..921968b603c57 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/multipart/other/OtherPackageFormDataBase.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.multipart.other; -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/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java index d25c9babfb75b..6da4d6f995ee3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/HelloResource.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.core.PathSegment; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.PathSegment; /** * Per spec: diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java index 2f4a928cd6749..73524b4a7c306 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/path/WhitespaceInPathTest.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.path; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java index eb8aa22d0608d..f64f237c5016d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileResource.java @@ -3,8 +3,8 @@ import java.io.File; import java.nio.file.Paths; -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.FilePart; import org.jboss.resteasy.reactive.PathPart; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java index c0b98dbdb896f..f3b748c965244 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java @@ -6,7 +6,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.FilePart; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java index 450b957d3ddf2..0da1a9f99f674 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/InvalidFileResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.providers; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.file.AsyncFile; import io.vertx.ext.web.RoutingContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java index 9e17b971fec0b..04f31490c086f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WithWriterInterceptor.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.METHOD, ElementType.TYPE }) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java index 27ac91942b55a..a384af66a8691 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/WriterInterceptor.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.WriterInterceptorContext; @WithWriterInterceptor @Provider -public class WriterInterceptor implements javax.ws.rs.ext.WriterInterceptor { +public class WriterInterceptor implements jakarta.ws.rs.ext.WriterInterceptor { @Override public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java index 6b93f16015512..4c1c6a96a8b64 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortFilterWithLargePayloadTest.java @@ -3,14 +3,14 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -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.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java index 2b744118207eb..c6bb422b7a21f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/AbortingRequestFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; @Provider public class AbortingRequestFilter implements ContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java index e78e3bb05f348..4d9e2aae2be34 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/BasicGenericTypesHandlingTest.java @@ -8,14 +8,14 @@ import java.nio.charset.StandardCharsets; import java.util.function.Supplier; -import javax.ws.rs.Consumes; -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.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +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.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java index 03189c70debf2..59e7cfa17e21f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ClassLevelMediaTypeTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ClassLevelMediaTypeResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java index 89d7caa9bf46e..e4fe138d6cf0d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CollectionDefaultValueTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.CollectionDefaultValueResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java index 5a543020896ba..2a2d4fda7fc59 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.CovariantReturnSubresourceLocatorsRootProxy; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java index f930b447f4c70..6373ed7ba9015 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java @@ -3,12 +3,12 @@ import java.io.ByteArrayOutputStream; import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java index 6af2b64a8a902..f57cd11223572 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericEntityTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.GenericEntityDoubleWriter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java index 269fa72d3a05e..adc30b7e50e88 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/GenericResourceTest.java @@ -2,8 +2,8 @@ import java.util.function.Supplier; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.GenericResourceCrudResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java index 3e415b6ae6267..03ef0a6103478 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/HttpHeadersTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.HttpHeadersResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java index 90c0e09bb9573..a3854fd50c485 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/InheritanceTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.InheritenceParentResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java index 827be5f0a9c1c..5292c8ceb37b0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MatchedResourceTest.java @@ -2,11 +2,11 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MatchedResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java index b900614da4a48..5ceb25edc40fe 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MediaTypeFromMessageBodyWriterListAsText; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java index 2b1e344a39120..f4d8a680d5a46 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationClientQualityTest.java @@ -6,19 +6,19 @@ import java.lang.reflect.Type; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -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.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java index 43b81a7f448e8..9a2f47221f2e1 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MediaTypeNegotiationServerQualityTest.java @@ -6,21 +6,21 @@ import java.lang.reflect.Type; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java index f144f5188f657..4b970fb638eb3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultiInterfaceResLocatorTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.MultiInterfaceResLocatorIntf1; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java index 2358d3fbb6c14..1d6fa1471847d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/MultipleAcceptHeaderTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.client.ClientBuilder; import org.jboss.resteasy.reactive.client.impl.ClientImpl; import org.jboss.resteasy.reactive.client.impl.WebTargetImpl; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java index 8bab7888cb7db..5f533daa56e6f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ParameterSubResTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ApplicationScopeObject; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java index fc7123fba6ba3..be56524a378c0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ReponseInfoTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ResponseInfoResource; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/RequestFilterQueryParamsTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/RequestFilterQueryParamsTest.java index 130f8c79598bf..1c286fcd5422f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/RequestFilterQueryParamsTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/RequestFilterQueryParamsTest.java @@ -5,17 +5,17 @@ import java.io.IOException; import java.net.URI; -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.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.Provider; +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.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java index 68f61411c14f2..f9d6e9bb7fa5f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/ResourceLocatorTest.java @@ -5,13 +5,13 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.ResourceLocatorAbstractAnnotationFreeResouce; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java index f7e63ffb618b0..1c54c06781abe 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SpecialResourceTest.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java index df7be4a8892b8..7576a85277bdc 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceLocatorTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.SubResourceLocatorBaseCrudService; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java index 47b751960803c..635b1d3b6d859 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/SubResourceRequestFilterTest.java @@ -3,15 +3,15 @@ import java.io.IOException; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestPath; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java index 5fd078f5a8140..01a2e60f3264a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/UriInfoTest.java @@ -2,11 +2,11 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.hamcrest.Matchers; import org.jboss.logging.Logger; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java index ae5d749fc4926..bdcb758c0b833 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/WiderMappingNegativeTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource.WiderMappingDefaultOptions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java index fc2a685a2ffb2..cee13ffce8b59 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ApplicationScopeObject.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ApplicationScopeObject { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ClassLevelMediaTypeResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ClassLevelMediaTypeResource.java index 7267d7946cf62..fdce12438f45f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ClassLevelMediaTypeResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ClassLevelMediaTypeResource.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -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("/test") @Produces(MediaType.APPLICATION_JSON) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java index b9c14ee7090bf..2fd79cbe0674f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CollectionDefaultValueResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -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 jakarta.ws.rs.BeanParam; +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 org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java index 520751225c131..9c21cd8aa317d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; public interface CovariantReturnSubresourceLocatorsRootProxy { @Path("sub/{path}") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java index 0c3f64a8901b4..eb6a9e2d1ea9b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; public interface CovariantReturnSubresourceLocatorsSubProxy { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java index 3fc2d2cdb5bf2..eb145a5a6273a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/path") public class CovariantReturnSubresourceLocatorsSubProxyRootImpl implements CovariantReturnSubresourceLocatorsRootProxy { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultCharsetResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultCharsetResource.java index 30244c098deb9..382cf6f77edef 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultCharsetResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultCharsetResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/") public class DefaultCharsetResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java index ba8f67206e065..f66860017c441 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java @@ -2,14 +2,14 @@ import java.util.Date; -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.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +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.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java index 6039a0b417d94..40f981db45386 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ExtensionResource.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Locale; -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.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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java index b9358b474e4f9..d4f5e55e9f2ff 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityDoubleWriter.java @@ -7,12 +7,12 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -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.Produces; +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 org.jboss.logging.Logger; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java index 70fc9b7f6d76f..7fa56e9cbd321 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityFloatWriter.java @@ -7,12 +7,12 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -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.Produces; +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 org.jboss.logging.Logger; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java index 21d7182c3f628..48e93d2a045e9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java @@ -7,11 +7,11 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java index 98928024c5f40..cc24e67946064 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericEntityResource.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; @Path("/") public class GenericEntityResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceCrudResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceCrudResource.java index 1bb1610db34bb..1381d2e155f41 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceCrudResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceCrudResource.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; /** * This is a sample of a CRUD resource template which can be reused for different entities. diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java index ddae9aceae291..234f0c06d2b7d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentCrudResource.java @@ -3,9 +3,9 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; /** * RESTEasy should be able to use type parameter values (Student, Integer) for (de)marshalling parameters/entity body. diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentInterface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentInterface.java index 5626656da2cb2..9e7827b80df1d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentInterface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentInterface.java @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; /** * This interface is used on the client side only. diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java index 0b6c6773903f8..b43f9154e9897 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentReader.java @@ -7,12 +7,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; @Provider @Consumes("application/student") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java index 4d365c5a7aa5c..b6226e7212b7e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GenericResourceStudentWriter.java @@ -6,12 +6,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Produces; -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.Produces; +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; @Provider @Produces("application/student") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GetAbsolutePathResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GetAbsolutePathResource.java index f0e095c957b72..20711ae1ac4b5 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GetAbsolutePathResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/GetAbsolutePathResource.java @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; @Path("absolutePath") public class GetAbsolutePathResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java index 180dc846a5144..5e4654e447215 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/HttpHeadersResource.java @@ -8,14 +8,14 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResource.java index 2efd28088a91c..86ffbf77d366c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; public interface InheritenceParentResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResourceImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResourceImpl.java index 1855d9ff1cb9d..6dac4909ecb83 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResourceImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/InheritenceParentResourceImpl.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path(value = "/InheritanceTest") public class InheritenceParentResourceImpl implements InheritenceParentResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MatchedResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MatchedResource.java index 5b6b3f317d493..860748b0fcc59 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MatchedResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MatchedResource.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/") public class MatchedResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java index c24c12342c9a3..65a984692cd8d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.util.Collection; -import javax.ws.rs.Produces; -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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; @Provider @Produces(MediaType.TEXT_PLAIN + "; charset=UTF-8") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java index 1bdb2e90346dd..be34246a65eca 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.util.Collection; -import javax.ws.rs.Produces; -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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; @Provider @Produces(MediaType.APPLICATION_XML + "; charset=UTF-8") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java index 641f53dfc5216..cf6c4b7e88a32 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java @@ -3,15 +3,15 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; @Path("/") public class MediaTypeFromMessageBodyWriterResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java index c9cca58e923d8..f33730c6e4c54 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public interface MultiInterfaceResLocatorIntf1 { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java index 266cf73c601df..865049193869a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public interface MultiInterfaceResLocatorIntf2 { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorResource.java index c5761c50333d6..6772d23e48a25 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultiInterfaceResLocatorResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/") public class MultiInterfaceResLocatorResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java index 379d0e99c2c47..8d032140ae69e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/MultipleGetResource.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -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; @Path("/api") @Produces(MediaType.APPLICATION_JSON) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java index 3ff891ae86fc2..e89319cefb098 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResClassSub.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java index 33801508ac5a2..eed31404da8f6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericInterface.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; public interface ParameterSubResGenericInterface { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java index 5684b4c99166d..b10e593347fd7 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResGenericSub.java @@ -5,7 +5,7 @@ import java.lang.reflect.Proxy; import java.util.List; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("generic") public class ParameterSubResGenericSub { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResInternalInterface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResInternalInterface.java index 8e20ea6e123c8..b85b7ce93119b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResInternalInterface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResInternalInterface.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.PUT; +import jakarta.ws.rs.PUT; public interface ParameterSubResInternalInterface { @PUT diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRoot.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRoot.java index c79cf57d1443c..24cfa2f28f787 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRoot.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRoot.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; public interface ParameterSubResRoot { @Path("sub/{path}") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRootImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRootImpl.java index 7be6ce201c0f2..5d71bf2a46420 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRootImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResRootImpl.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/path") public class ParameterSubResRootImpl implements ParameterSubResRoot { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResSub.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResSub.java index 07b6eb79bcbfc..0f6ce45d414af 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResSub.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ParameterSubResSub.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; public interface ParameterSubResSub { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java index 415a044b1cece..f68be89cfad43 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/RequestScopedObject.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestScopedObject { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java index c45e5aa2385ea..ee5691a6eab02 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceInfoInjectionFilter.java @@ -3,13 +3,13 @@ import java.io.IOException; import java.lang.reflect.Method; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Provider; @Provider public class ResourceInfoInjectionFilter implements ContainerResponseFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java index 17aa256b6b129..a50c6335a8231 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorBaseResource.java @@ -5,10 +5,10 @@ import java.lang.reflect.Proxy; import java.util.List; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorCollectionResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorCollectionResource.java index 5bafeb2f54675..72691ea43766f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorCollectionResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorCollectionResource.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/collection") public class ResourceLocatorCollectionResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorDirectory.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorDirectory.java index a4f28c1cc9c90..ab57fd494a1e7 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorDirectory.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorDirectory.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/directory") public class ResourceLocatorDirectory { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorReceiver.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorReceiver.java index ae818ba0fcb57..087127fedc6f1 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorReceiver.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorReceiver.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; public class ResourceLocatorReceiver { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorRootInterface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorRootInterface.java index da0a1b73a01e4..6b34e0e0f86c4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorRootInterface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorRootInterface.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -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; @Produces(MediaType.TEXT_PLAIN) public interface ResourceLocatorRootInterface { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubInterface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubInterface.java index 5f81b4432cbc2..580b845ad457d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubInterface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubInterface.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -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.Produces; +import jakarta.ws.rs.core.MediaType; @Produces(MediaType.TEXT_PLAIN) public interface ResourceLocatorSubInterface extends ResourceLocatorRootInterface { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java index b793f9dc6ea3f..dbf4b13b1c049 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestPath; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java index 83206d4f57f83..b5c989ffb4223 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource2.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java index 1417ed22e3476..8cbb9981470bc 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; public interface ResourceLocatorSubresource3Interface { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java index b966fc7e5df27..1af968a207567 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ResponseInfoResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanProxy.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanProxy.java index 78fdf1b1b1a58..ac6f8f11990d6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanProxy.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanProxy.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/test") public interface ScanProxy { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanSubresource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanSubresource.java index 011f6f918d21f..e8aa6ca7f1fe3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanSubresource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/ScanSubresource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; public class ScanSubresource { @Path("doit") diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java index 1d172f1ef20db..fb332d09edc16 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceApiResource.java @@ -1,11 +1,11 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -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.Context; -import javax.ws.rs.core.HttpHeaders; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java index 2daf91d9b3b1a..33ad0fe1cb306 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceDeleteResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java index fdcd16ee35eb4..dea16bae4e321 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SpecialResourceStreamResource.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/inputstream") public class SpecialResourceStreamResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java index 3875fd3e41edf..c15ff60a8f053 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java @@ -2,15 +2,15 @@ import java.util.List; -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; public interface SubResourceLocatorBaseCrudService { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseService.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseService.java index 3d5975e0b44b8..d874b83f2eb87 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseService.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorBaseService.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -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; public interface SubResourceLocatorBaseService extends SubResourceLocatorBaseCrudService { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorFoo.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorFoo.java index d492575bf224a..c57a3d5ecf544 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorFoo.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorFoo.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; public interface SubResourceLocatorFoo { @GET diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorImpFoo.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorImpFoo.java index ac2472f0d255a..d23d911523d79 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorImpFoo.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorImpFoo.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("blah") public class SubResourceLocatorImpFoo implements SubResourceLocatorFoo { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java index aa85808cc854b..5418512b3da9e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; public class SubResourceLocatorPlatformServiceImpl implements SubResourceLocatorPlatformServiceResource { @Override diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java index 66b54f5ea66e0..6807485c25ae5 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/platform") public interface SubResourceLocatorPlatformServiceResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java index a990b3c9b8045..a46ed1f269104 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/SubResourceLocatorUserResource.java @@ -2,16 +2,16 @@ import java.util.List; -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.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.QueryParam; +import jakarta.ws.rs.core.MediaType; @Path("/users") public interface SubResourceLocatorUserResource extends SubResourceLocatorBaseService { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java index 1f01af4f575f4..95c484adeaf77 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedQueryResource.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java index 58a7f6367e341..8e127e7d417ec 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEncodedTemplateResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java index f091f0e2920f1..ca5dcceeab93d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java index 660299d8c1eca..58c5df88dc9b5 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoQueryParamsResource.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java index a69feaa3d3e92..29ac78a230a35 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoRelativizeResource.java @@ -2,12 +2,12 @@ import java.net.URI; -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.UriInfo; +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.UriInfo; @Path("/") public class UriInfoRelativizeResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java index b2d9db1fdb3b8..06981e052dd40 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoResolveResource.java @@ -2,12 +2,12 @@ import java.net.URI; -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.UriInfo; +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.UriInfo; @Path("/") public class UriInfoResolveResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java index 6465d1784a349..414bc684ef04d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java index c556a3859fa10..b357deff8b907 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/UriInfoSimpleSingletonResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.simple.PortProviderUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingDefaultOptions.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingDefaultOptions.java index 24ff01f5f0976..b8923eff33930 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingDefaultOptions.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingDefaultOptions.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; @Path("{x:.*}") public class WiderMappingDefaultOptions { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingResource.java index f686a3de0209b..61f4672009770 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/WiderMappingResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resource.basic.resource; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/hello") public class WiderMappingResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java index 2dd2b688a1896..d3422b07d712c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ContentLengthTest.java @@ -9,12 +9,12 @@ import java.util.Collections; import java.util.UUID; -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 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.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java index 902ca5da4688c..04a8b03e7aa9d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/CustomHeadersAndWriterInterceptorTest.java @@ -7,15 +7,15 @@ import java.io.IOException; import java.util.Date; -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.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +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.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java index d69d5180503c8..e56953e7ca045 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ExceptionInWriterTest.java @@ -9,15 +9,15 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -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.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -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.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java index 7f12bf0d0d74d..14a70637f380b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/NullHeaderTestCase.java @@ -4,13 +4,13 @@ import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -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.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java index 93a4dcc19168d..40af3653860a6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/ResponseTest.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.response; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java index 7a8c7079fe229..de79c0a6f427a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/response/RestResponseResource.java @@ -7,13 +7,13 @@ import java.util.Locale; import java.util.Optional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Variant; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Variant; import org.jboss.resteasy.reactive.RestResponse; import org.jboss.resteasy.reactive.server.ServerExceptionMapper; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncFilterExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncFilterExceptionMapper.java index 0531ed3404de8..02cceb13a2343 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncFilterExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncFilterExceptionMapper.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -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.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class AsyncFilterExceptionMapper implements ExceptionMapper { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java index 5c09df2ce7eaa..d1d07a2c57c64 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @PreMatching @Priority(1) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java index 74064a3dbf1cf..53221b9ddb52c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @PreMatching @Priority(2) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java index 8bcc84c023f2b..884ebaadaa328 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @PreMatching @Priority(3) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java index be081580ae35e..dd36c34f8d110 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter.java @@ -4,7 +4,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter1.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter1.java index 511ba873b0a9b..94937acc29499 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter1.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter1.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(1) @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter2.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter2.java index e138e246b0aeb..1371657aa5015 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter2.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter2.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(2) @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter3.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter3.java index 9083998cb1c59..58814fa126806 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter3.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilter3.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(3) @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java index a19d730967ebb..d11ac82473f52 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterResource.java @@ -5,12 +5,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java index 96b53b1dcb39b..54e2679da9477 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncRequestFilterTest.java @@ -4,11 +4,11 @@ import java.util.function.Supplier; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.vertx.test.ExceptionUtil; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java index def6ed60875af..3503107d3bb55 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResource.java @@ -4,13 +4,13 @@ import java.io.StringWriter; import java.util.concurrent.TimeUnit; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -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.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java index 2bf66257f3d78..bf1d3fc101820 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter.java @@ -6,7 +6,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseContext; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter1.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter1.java index b8f055e7c5280..7cf06e37098f0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter1.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter1.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(1) @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter2.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter2.java index 068d933a400e9..9e9c8c3eb45ff 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter2.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter2.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(2) @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter3.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter3.java index 75b475c524f55..66899eadf3f5e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter3.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resteasy/async/filters/AsyncResponseFilter3.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.resteasy.async.filters; -import javax.annotation.Priority; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ext.Provider; @Priority(3) @Provider diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java index c72a8f849ae52..90dfd911a1cdb 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationPathTest.java @@ -2,10 +2,10 @@ import java.util.function.Supplier; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java index fea2bd8580f0e..30f6b401fe370 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationTest.java @@ -9,19 +9,19 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java index b97ea03e1cd4d..cb90792e1b81a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ApplicationWithBlockingTest.java @@ -2,9 +2,9 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java index 0af26aa80a7f0..72d423df70047 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Bar.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.TYPE, ElementType.METHOD }) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java index 0b3eb2d21771c..6c0b993382863 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamEmptySubclassTest.java @@ -1,12 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.BeanParam; -import javax.ws.rs.FormParam; -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.ws.rs.BeanParam; +import jakarta.ws.rs.FormParam; +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.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java index e8c5d2107b79f..f6c4190a1fb63 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSubClass.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java index fc087fbe35586..f05c72dea64b2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamSuperClass.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java index b321c2e34d0f6..74acf7d331e41 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BeanParamWithLocalDateTimeTest.java @@ -3,10 +3,10 @@ import java.time.LocalDateTime; import java.util.function.Supplier; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java index e969be0164cbe..5c77a829e26e8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/BlockingWithFilterTest.java @@ -6,11 +6,11 @@ import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.resteasy.reactive.server.ServerRequestFilter; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java index 345c04ef9027d..a11abd21bb520 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/DynamicFeatureRequestFilterWithLowPriority.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; @Priority(Priorities.USER + 1000) public class DynamicFeatureRequestFilterWithLowPriority implements ContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java index 0e61faeea1e5e..80d36db83d4f9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureMappedExceptionMapper.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; public class FeatureMappedExceptionMapper implements Cloneable, ExceptionMapper, Serializable { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java index 0f1472dc7a1ff..192783581fadb 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithHighestPriority.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; @Priority(Priorities.AUTHENTICATION) public class FeatureRequestFilterWithHighestPriority implements ContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java index 0853242d792a0..d0c51bbc071a8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureRequestFilterWithNormalPriority.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; public class FeatureRequestFilterWithNormalPriority implements ContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java index 55eb704288fab..f9b29457d0185 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FeatureResponseFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; public class FeatureResponseFilter implements ContainerResponseFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java index e29f66774c765..12957d8d6a4af 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedResource.java @@ -1,12 +1,12 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java index e0c9a2200d50c..803a2059e5e7d 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/FieldInjectedSubClassResource.java @@ -1,13 +1,13 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java index f785a82655ee4..63b9d150d68a0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Foo.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Target({ ElementType.TYPE, ElementType.METHOD }) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HeaderParamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HeaderParamResource.java index 0545e4a35fd88..999f7f8b944bf 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HeaderParamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HeaderParamResource.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; @Path("/ctor-header") public class HeaderParamResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java index 2d23570a5db03..93772258c288c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/HelloService.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.core.Context; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.core.Context; import io.vertx.ext.web.RoutingContext; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java index c3dfbeb19f5aa..0e18a295eb4c6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/IllegalClassExceptionMapper.java @@ -6,9 +6,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java index f242b1186b784..220a56196ddd8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InstantParamTest.java @@ -3,8 +3,8 @@ import java.time.Duration; import java.time.Instant; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResource.java index b2f0a2afcdffc..35578d428a9aa 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResource.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -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("iface") public interface InterfaceResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResourceImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResourceImpl.java index 738b98bf42212..da202de7ea19f 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResourceImpl.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceResourceImpl.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.inject.Inject; +import jakarta.inject.Inject; public class InterfaceResourceImpl implements InterfaceResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java index 34e8179df65f8..23320b20da352 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/InterfaceWithImplTest.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -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.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java index 4a4afc2abba5d..742a213648bd0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateCustomParamConverterProviderTest.java @@ -5,13 +5,13 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java index 6305daacea016..f3b59f8d673b8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateParamTest.java @@ -3,12 +3,12 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import javax.ws.rs.FormParam; -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.ws.rs.FormParam; +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.hamcrest.Matchers; import org.jboss.resteasy.reactive.DateFormat; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java index 3e79191243710..d69a18a11d5ba 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/LocalDateTimeParamTest.java @@ -4,10 +4,10 @@ import java.time.format.DateTimeFormatter; import java.util.Optional; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.DateFormat; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java index 15830b6156107..390f46896edf2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MultipleAcceptHeadersTest.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterConverter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterConverter.java index ca395b50dbfac..39cc7443886c3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterConverter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterConverter.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; public class MyParameterConverter implements ParamConverter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java index 355c66c89e04e..65c0433d857b3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/MyParameterProvider.java @@ -3,9 +3,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; @Provider public class MyParameterProvider implements ParamConverterProvider { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java index 10661e08b36d2..4688d263ac87b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NameBindingWithInterfaceTest.java @@ -6,15 +6,15 @@ import java.io.IOException; import java.lang.annotation.Retention; -import javax.ws.rs.GET; -import javax.ws.rs.NameBinding; -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.MediaType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NameBinding; +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.MediaType; +import jakarta.ws.rs.ext.Provider; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java index 1756c42ad5e38..c4dda4a2c42d8 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/NewParamsRestResource.java @@ -2,21 +2,21 @@ import java.util.Optional; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Providers; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Providers; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.reactive.RestCookie; import org.jboss.resteasy.reactive.RestForm; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java index d30f1f3c04b88..0395552a037b9 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherBeanParam.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java index c688200094073..a40df8c44d7dd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/OtherJavaTimeParamTest.java @@ -5,9 +5,9 @@ import java.time.OffsetTime; import java.time.ZonedDateTime; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Person.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Person.java index 21a167d2a6df0..30012ce66af12 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Person.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/Person.java @@ -1,6 +1,6 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class Person { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/QueryParamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/QueryParamResource.java index b92e76bfa1885..ef7a73be101d6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/QueryParamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/QueryParamResource.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; @Path("/ctor-query") public class QueryParamResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java index b73d2ba238a53..081a51df804c7 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RawListQueryParamTest.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.resteasy.reactive.RestQuery; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java index 7a3481e75e4ca..482cf5b09a60b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/ResourceInfoInjectingFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; @Provider public class ResourceInfoInjectingFilter implements ContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootAResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootAResource.java index fccba53949602..2bd0cd64c22bd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootAResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootAResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/") public class RootAResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootBResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootBResource.java index 7017b1d2ebd51..aefa3a5a199c6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootBResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/RootBResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/") public class RootBResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java index d8d72459a1d16..e12d4c7499a23 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleBeanParam.java @@ -3,10 +3,10 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Assertions; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java index 5570f23f853ee..4af56218cbf7c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java @@ -6,32 +6,32 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.PATCH; -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.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Providers; +import jakarta.inject.Inject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.PATCH; +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.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Providers; import org.jboss.resteasy.reactive.RestHeader; import org.jboss.resteasy.reactive.server.SimpleResourceInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SubResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SubResource.java index 0ed36f8f934b4..4d42e113d11d2 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SubResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/SubResource.java @@ -1,7 +1,7 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; public class SubResource { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java index 72a5cc97b5f8a..a90186b912684 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TRACE.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; @HttpMethod("TRACE") @Target(value = ElementType.METHOD) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java index 7a7ac0404cb63..b2ca393b08db0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarRequestFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Bar diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java index b01c6c899748c..c4bd4d874ab28 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestBarResponseFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Bar diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestDynamicFeature.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestDynamicFeature.java index 5f147f349db68..dfa6c21c2a184 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestDynamicFeature.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestDynamicFeature.java @@ -1,10 +1,10 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; @Provider public class TestDynamicFeature implements DynamicFeature { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestExceptionMapper.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestExceptionMapper.java index 5cf7150e0c9ad..39065d09799b4 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestExceptionMapper.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestExceptionMapper.java @@ -1,8 +1,8 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class TestExceptionMapper implements ExceptionMapper { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFeature.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFeature.java index efb8a5d95f6ca..ad58d8252472a 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFeature.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFeature.java @@ -1,9 +1,9 @@ package org.jboss.resteasy.reactive.server.vertx.test.simple; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; @Provider public class TestFeature implements Feature { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java index de56a4975e195..50416c2365581 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarRequestFilter.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Foo diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java index a5791a67f9f72..53239a3e71dba 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooBarResponseFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Foo diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java index 572df6cec0011..93a883b9fc1d3 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooRequestFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import io.vertx.core.http.HttpServerRequest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java index 64a9a724ab824..d26bf29fe329e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestFooResponseFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Foo diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java index eef9f625b140f..d964247ce1e55 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestPreMatchRequestFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.ext.Provider; @Provider @PreMatching diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java index ed1bb1ca467de..ccb74229b83d6 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilter.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider public class TestRequestFilter implements ContainerRequestFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java index de12212bb6902..1af358d136ddc 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighPriority.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Priority(Priorities.AUTHORIZATION) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java index b7b5ba0aa0378..34562be09d153 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestRequestFilterWithHighestPriority.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Priority(Priorities.AUTHENTICATION) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java index 32ff944a251a8..7d88b62c3948e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestResponseFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.ext.Provider; @Provider public class TestResponseFilter implements ContainerResponseFilter { diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java index 1d869c71a6e08..b04a67e75ca84 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestUtil.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java index 18f8a2194846f..bedb354add483 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/simple/TestWriter.java @@ -6,12 +6,12 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.Produces; -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.Produces; +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; @Provider @Produces(MediaType.TEXT_PLAIN) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java index 8a06ff17841bf..cc1460f2d2874 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/status/ResponseStatusTest.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 org.jboss.resteasy.reactive.ResponseStatus; import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java index ce95c5eccc8c6..41aebefcb6d1b 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamResource.java @@ -1,22 +1,23 @@ package org.jboss.resteasy.reactive.server.vertx.test.stream; import java.util.Date; +import java.util.concurrent.Flow.Publisher; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -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.common.util.MultiCollectors; -import org.reactivestreams.Publisher; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.infrastructure.Infrastructure; import io.vertx.core.buffer.Buffer; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; @Path("stream") public class StreamResource { @@ -44,6 +45,13 @@ public Publisher getStreamedTextPublisher() { return Multi.createFrom().items("foo", "bar"); } + @Path("text/stream/legacy-publisher") + @GET + @Produces(MediaType.TEXT_PLAIN) + public org.reactivestreams.Publisher getStreamedTextLegacyPublisher() { + return AdaptersToReactiveStreams.publisher(Multi.createFrom().items("foo", "bar")); + } + @Path("byte-arrays/collect") @GET @Produces(MediaType.TEXT_PLAIN) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java index 70a59d21cde79..d97c50659ec71 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stream/StreamTestCase.java @@ -9,10 +9,10 @@ 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.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.hamcrest.Matchers; import org.jboss.resteasy.reactive.client.impl.MultiInvoker; @@ -104,6 +104,10 @@ public void testStreaming() throws Exception { .then() .statusCode(200) .body(Matchers.equalTo("foobar")); + RestAssured.get("/stream/text/stream/legacy-publisher") + .then() + .statusCode(200) + .body(Matchers.equalTo("foobar")); RestAssured.get("/stream/text/collect") .then() .statusCode(200) diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java index 4d83f9a4e9015..56953ea56191e 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/stress/SuspendResumeStressTest.java @@ -8,8 +8,8 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.jandex.ClassInfo; diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java index 135afcafb34e8..f1c215f1e59cd 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/transformation/AnnotationTransformationTest.java @@ -12,8 +12,8 @@ import java.util.Collections; import java.util.function.Consumer; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.Path; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.Path; import org.hamcrest.Matchers; import org.jboss.jandex.AnnotationInstance; diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java index 82751b9072276..99eb1068ffda3 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java @@ -16,9 +16,9 @@ */ package {package-name}.it; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/{extension.id}") @ApplicationScoped diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java index 1ccb2b7eff1fa..615b3616e2bd8 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java @@ -7,9 +7,9 @@ {/for} import io.quarkus.runtime.Quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("{resource.path}") @ApplicationScoped @@ -23,4 +23,4 @@ public String sayHello() { public static void main(String[] args) { Quarkus.run(args); } -} \ No newline at end of file +} diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts index 044ac95a86bd6..a5b4296979942 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts @@ -9,8 +9,8 @@ plugins { {/include} allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle index 6c51b5039f488..dc49170064537 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle @@ -9,8 +9,8 @@ plugins { {/include} allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml index 303e11409fcc7..0532b34698708 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml @@ -48,8 +48,8 @@ - - + + diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java index 769ac7eccf80a..720033d91c9f2 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java @@ -1,9 +1,9 @@ package org.acme; -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("{resource.path}") public class {resource.class-name} { @@ -13,4 +13,4 @@ public class {resource.class-name} { public String hello() { return "{resource.response}"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt index 6cf3f82e70791..c406ce55ca1f1 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt @@ -1,9 +1,9 @@ package org.acme -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("{resource.path}") class {resource.class-name} { diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala index 9c1d477333e38..dc1b6cda15acb 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.\{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.\{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("{resource.path}") class {resource.class-name} { diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java index 769ac7eccf80a..720033d91c9f2 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java @@ -1,9 +1,9 @@ package org.acme; -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("{resource.path}") public class {resource.class-name} { @@ -13,4 +13,4 @@ public class {resource.class-name} { public String hello() { return "{resource.response}"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt index 6cf3f82e70791..c406ce55ca1f1 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt @@ -1,9 +1,9 @@ package org.acme -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("{resource.path}") class {resource.class-name} { diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala index 9c1d477333e38..dc1b6cda15acb 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.\{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.\{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("{resource.path}") class {resource.class-name} { diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/java/src/main/java/org/acme/MyHelloExample.java b/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/java/src/main/java/org/acme/MyHelloExample.java index d62649d8e0f0a..8b1af68449c77 100644 --- a/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/java/src/main/java/org/acme/MyHelloExample.java +++ b/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/java/src/main/java/org/acme/MyHelloExample.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyHelloExample { diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/kotlin/src/main/kotlin/org/acme/MyHelloExample.kt b/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/kotlin/src/main/kotlin/org/acme/MyHelloExample.kt index c6ee2362989d2..4ac07ff305bb0 100644 --- a/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/kotlin/src/main/kotlin/org/acme/MyHelloExample.kt +++ b/independent-projects/tools/codestarts/examples/quarkus/my-extension-codestart/kotlin/src/main/kotlin/org/acme/MyHelloExample.kt @@ -1,6 +1,6 @@ package org.acme -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class MyHelloExample { diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java index 5af617e2e7a55..b39f76f5c33e7 100644 --- a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java +++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java @@ -9,24 +9,24 @@ class SmartPackageFileStrategyHandlerTest { @Test void testRefactorJava() { assertThat(SmartPackageFileStrategyHandler.refactorPackage( - "package org.acme.qute;\n\nimport org.acme.qute.Something\nimport javax.ws.rs.core.MediaType\n", + "package org.acme.qute;\n\nimport org.acme.qute.Something\nimport jakarta.ws.rs.core.MediaType\n", "my.java.app")).isEqualTo( - "package my.java.app.qute;\n\nimport my.java.app.qute.Something\nimport javax.ws.rs.core.MediaType\n"); + "package my.java.app.qute;\n\nimport my.java.app.qute.Something\nimport jakarta.ws.rs.core.MediaType\n"); } @Test void testRefactorKotlin() { assertThat(SmartPackageFileStrategyHandler.refactorPackage( - "package org.acme.qute\n\nimport org.acme.qute.Something\nimport javax.ws.rs.core.MediaType\n", + "package org.acme.qute\n\nimport org.acme.qute.Something\nimport jakarta.ws.rs.core.MediaType\n", "my.kotlin.app")).isEqualTo( - "package my.kotlin.app.qute\n\nimport my.kotlin.app.qute.Something\nimport javax.ws.rs.core.MediaType\n"); + "package my.kotlin.app.qute\n\nimport my.kotlin.app.qute.Something\nimport jakarta.ws.rs.core.MediaType\n"); } @Test void testRefactorScala() { assertThat(SmartPackageFileStrategyHandler.refactorPackage( - "package org.acme.qute\n\nimport org.acme.qute.Something\nimport org.acme.qute.\\{GET, Path, Produces}\nimport javax.ws.rs.core.MediaType\n", + "package org.acme.qute\n\nimport org.acme.qute.Something\nimport org.acme.qute.\\{GET, Path, Produces}\nimport jakarta.ws.rs.core.MediaType\n", "my.scala.app")).isEqualTo( - "package my.scala.app.qute\n\nimport my.scala.app.qute.Something\nimport my.scala.app.qute.\\{GET, Path, Produces}\nimport javax.ws.rs.core.MediaType\n"); + "package my.scala.app.qute\n\nimport my.scala.app.qute.Something\nimport my.scala.app.qute.\\{GET, Path, Produces}\nimport jakarta.ws.rs.core.MediaType\n"); } } diff --git a/independent-projects/tools/devtools-common/pom.xml b/independent-projects/tools/devtools-common/pom.xml index 974af9b668fd1..c2805f5cac5db 100644 --- a/independent-projects/tools/devtools-common/pom.xml +++ b/independent-projects/tools/devtools-common/pom.xml @@ -66,18 +66,10 @@ org.apache.maven maven-plugin-api - - javax.annotation - javax.annotation-api - javax.enterprise cdi-api - - javax.inject - javax.inject - org.codehaus.plexus plexus-classworlds @@ -88,10 +80,6 @@ org.apache.maven maven-core - - javax.inject - javax.inject - org.checkerframework checker-qual diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java index 2a175fd5de8df..6938062ec8ff7 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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 GreetingResource { @@ -13,4 +13,4 @@ public class GreetingResource { public String hello() { return "Hello from RESTEasy Reactive"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java index 055f53c6fe033..f9eea334cb1e1 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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 GreetingResource { @@ -13,4 +13,4 @@ public class GreetingResource { public String hello() { return "Hello RESTEasy"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java index b9958edbb5b23..830a8f41aaade 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java @@ -1,9 +1,9 @@ package com.andy; -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("/bonjour") public class BonjourResource { @@ -13,4 +13,4 @@ public class BonjourResource { public String hello() { return "Hello RESTEasy"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt index 8ec4180e042ff..81e6f54370526 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt @@ -1,9 +1,9 @@ package com.andy -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("/bonjour") class BonjourResource { diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala index 57cdbdd8c7829..7adb6da83ba38 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala @@ -1,7 +1,7 @@ package com.andy -import javax.ws.rs.{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("/bonjour") class BonjourResource { diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_main.java b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_main.java index cc7da00033efe..c209baedcff55 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_main.java +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_main.java @@ -5,9 +5,9 @@ //DEPS io.quarkus:quarkus-resteasy import io.quarkus.runtime.Quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello-resteasy") @ApplicationScoped @@ -21,4 +21,4 @@ public String sayHello() { public static void main(String[] args) { Quarkus.run(args); } -} \ No newline at end of file +} diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java index ff566718859d8..a2e055db4a534 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java @@ -1,9 +1,9 @@ package ilove.quark.us; -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 GreetingResource { @@ -13,4 +13,4 @@ public class GreetingResource { public String hello() { return "Hello RESTEasy"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt index b014bba668107..7887add443d06 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt @@ -1,9 +1,9 @@ package ilove.quark.us -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") class GreetingResource { diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala index 7d287aeb54226..6810956e6c2c0 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala @@ -1,7 +1,7 @@ package ilove.quark.us -import javax.ws.rs.{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("/hello") class GreetingResource { diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java index c65c013da3d95..382f19a13488c 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java @@ -1,9 +1,9 @@ package ilove.quark.us; -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 GreetingResource { @@ -13,4 +13,4 @@ public class GreetingResource { public String hello() { return "Hello from RESTEasy Reactive"; } -} \ No newline at end of file +} diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt index 142f19634d0b4..14985fe82c9f0 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt @@ -1,9 +1,9 @@ package ilove.quark.us -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") class GreetingResource { diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala index 138be700d17be..0977b35dab1ce 100644 --- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala +++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/RESTEasyReactiveCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala @@ -1,7 +1,7 @@ package ilove.quark.us -import javax.ws.rs.{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType @Path("/hello") class GreetingResource { diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 84eb09de2fe9d..3a23177e80ffb 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -30,6 +30,10 @@ HEAD + 1.0.0 + 5.0.0 + 1.3.2 + 1 UTF-8 11 11 @@ -50,7 +54,7 @@ 3.24.2 2.14.2 - 2.0.2 + 4.0.1 5.9.2 1.22 3.5.0.Final @@ -176,6 +180,16 @@ jakarta.enterprise.cdi-api ${jakarta.enterprise.cdi-api.version} + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + + + javax.inject + javax.inject + ${javax.inject.version} + org.apache.maven maven-core diff --git a/integration-tests/amazon-lambda-http-resteasy-reactive/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java b/integration-tests/amazon-lambda-http-resteasy-reactive/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java index 932821299adc5..1fdb7abe63123 100644 --- a/integration-tests/amazon-lambda-http-resteasy-reactive/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java +++ b/integration-tests/amazon-lambda-http-resteasy-reactive/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.amazon.lambda; -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.Context; -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.Context; +import jakarta.ws.rs.core.MediaType; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/integration-tests/amazon-lambda-http-resteasy-reactive/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http-resteasy-reactive/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java index 2e52b4688c9b4..5ba4a9862a420 100644 --- a/integration-tests/amazon-lambda-http-resteasy-reactive/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java +++ b/integration-tests/amazon-lambda-http-resteasy-reactive/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.HashMap; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/CustomSecurityProvider.java b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/CustomSecurityProvider.java index 208bba8b908bd..d7242cd8b9f69 100644 --- a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/CustomSecurityProvider.java +++ b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/CustomSecurityProvider.java @@ -2,7 +2,7 @@ import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java index 52d3274a8acaa..9f5ec03c02ea5 100644 --- a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java +++ b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.amazon.lambda; -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.Context; -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.Context; +import jakarta.ws.rs.core.MediaType; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java index 73ebc7aa50f56..4555a180b4653 100644 --- a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java +++ b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.amazon.lambda; -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.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.SecurityContext; @Path("security") public class SecurityCheckResource { diff --git a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java index b69b2b6a3ac8d..e5b8b7c4eef36 100644 --- a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java +++ b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java @@ -2,7 +2,7 @@ import java.util.HashMap; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.codec.binary.Base64; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java index 36a740f406dac..cdbedd366a89f 100644 --- a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java +++ b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java @@ -1,14 +1,14 @@ package io.quarkus.it.amazon.lambda; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -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.Context; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +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.Context; +import jakarta.ws.rs.core.MediaType; import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; diff --git a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingServlet.java b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingServlet.java index bd3d1de8a2537..1cad6cfd42a89 100644 --- a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingServlet.java +++ b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java index 4bc39d2c7ba45..e08696b40a2a1 100644 --- a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java +++ b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityCheckResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.amazon.lambda; -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.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.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("security") public class SecurityCheckResource { diff --git a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityServlet.java b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityServlet.java index 8926090982cbd..eece2a14dbe3d 100644 --- a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityServlet.java +++ b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/SecurityServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletSecurity", urlPatterns = "/servlet/security") public class SecurityServlet extends HttpServlet { diff --git a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java index dbba308709465..043aa3b7142a2 100644 --- a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java +++ b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.HashMap; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java index b973990d8f39f..f41f8a578986f 100644 --- a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java +++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.amazon.lambda.v1; -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.Context; -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.Context; +import jakarta.ws.rs.core.MediaType; import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext; diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java index c883fc8be27ec..3414d2f2b09ab 100644 --- a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java +++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityCheckResource.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityCheckResource.java index 50933d9043889..66299971cf2a6 100644 --- a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityCheckResource.java +++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityCheckResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.amazon.lambda.v1; -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.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.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; @Path("security") public class SecurityCheckResource { diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityServlet.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityServlet.java index 06b27d1504543..bfcba67a1e6a6 100644 --- a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityServlet.java +++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/SecurityServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletSecurity", urlPatterns = "/servlet/security") public class SecurityServlet extends HttpServlet { diff --git a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java index be421d69cc8fc..bb61c2ee49d0c 100644 --- a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java +++ b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java @@ -7,7 +7,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.codec.binary.Base64; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/amazon-lambda-stream-handler/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java b/integration-tests/amazon-lambda-stream-handler/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java index 93c3536afa97e..1aa91a16be9de 100644 --- a/integration-tests/amazon-lambda-stream-handler/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java +++ b/integration-tests/amazon-lambda-stream-handler/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java @@ -4,7 +4,7 @@ import java.io.InputStream; import java.io.OutputStream; -import javax.inject.Named; +import jakarta.inject.Named; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java index 263fbcb6d1e3f..1476f9777c489 100644 --- a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java +++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java @@ -8,7 +8,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Documented diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java index cfc33c93a2178..463637a38f71a 100644 --- a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java +++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java @@ -2,10 +2,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Priority(1) @Count diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/ProcessingService.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/ProcessingService.java index c4b39501fe109..6c347f8cd914a 100644 --- a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/ProcessingService.java +++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/ProcessingService.java @@ -1,6 +1,6 @@ package io.quarkus.it.amazon.lambda; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProcessingService { diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java index 2462d3d54068d..c3f737c6bbc7a 100644 --- a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java +++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java @@ -1,7 +1,7 @@ package io.quarkus.it.amazon.lambda; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/UnusedLambda.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/UnusedLambda.java index c7e8f0933e7ad..fb241b632a1a9 100644 --- a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/UnusedLambda.java +++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/UnusedLambda.java @@ -1,7 +1,7 @@ package io.quarkus.it.amazon.lambda; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; diff --git a/integration-tests/avro-reload/src/test/java/io/quarkus/avro/deployment/AvroReloadResource.java b/integration-tests/avro-reload/src/test/java/io/quarkus/avro/deployment/AvroReloadResource.java index 810c2bc7d6ae0..944475e3d8e47 100644 --- a/integration-tests/avro-reload/src/test/java/io/quarkus/avro/deployment/AvroReloadResource.java +++ b/integration-tests/avro-reload/src/test/java/io/quarkus/avro/deployment/AvroReloadResource.java @@ -4,8 +4,8 @@ import java.util.Arrays; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import test.Level; import test.PrivacyImport; diff --git a/integration-tests/awt/src/main/java/io/quarkus/awt/it/Application.java b/integration-tests/awt/src/main/java/io/quarkus/awt/it/Application.java index a244461d038ab..d1bf3c62b3da9 100644 --- a/integration-tests/awt/src/main/java/io/quarkus/awt/it/Application.java +++ b/integration-tests/awt/src/main/java/io/quarkus/awt/it/Application.java @@ -30,11 +30,12 @@ import java.util.Locale; import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; import javax.imageio.spi.IIORegistry; import javax.imageio.spi.ImageReaderSpi; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; + import org.jboss.logging.Logger; import io.quarkus.runtime.Startup; diff --git a/integration-tests/awt/src/main/java/io/quarkus/awt/it/ImageResource.java b/integration-tests/awt/src/main/java/io/quarkus/awt/it/ImageResource.java index 78b4ae491f595..f9b42202e1ea3 100644 --- a/integration-tests/awt/src/main/java/io/quarkus/awt/it/ImageResource.java +++ b/integration-tests/awt/src/main/java/io/quarkus/awt/it/ImageResource.java @@ -35,15 +35,16 @@ import javax.imageio.plugins.tiff.TIFFField; import javax.imageio.plugins.tiff.TIFFTag; import javax.imageio.stream.ImageOutputStream; -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.PathParam; -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.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; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; diff --git a/integration-tests/bootstrap-config/application/src/main/java/io/quarkus/it/bootstrap/config/ConfigResource.java b/integration-tests/bootstrap-config/application/src/main/java/io/quarkus/it/bootstrap/config/ConfigResource.java index 1617c7cee9390..255f008a1f7eb 100644 --- a/integration-tests/bootstrap-config/application/src/main/java/io/quarkus/it/bootstrap/config/ConfigResource.java +++ b/integration-tests/bootstrap-config/application/src/main/java/io/quarkus/it/bootstrap/config/ConfigResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.bootstrap.config; -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 javax.ws.rs.core.Response; +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 jakarta.ws.rs.core.Response; import io.quarkus.runtime.annotations.RegisterForReflection; import io.smallrye.config.SmallRyeConfig; diff --git a/integration-tests/bootstrap-config/application/src/test/java/io/quarkus/it/bootstrap/config/ConfigResourceTest.java b/integration-tests/bootstrap-config/application/src/test/java/io/quarkus/it/bootstrap/config/ConfigResourceTest.java index 32eac7eef4f93..b78cdb8fe9113 100644 --- a/integration-tests/bootstrap-config/application/src/test/java/io/quarkus/it/bootstrap/config/ConfigResourceTest.java +++ b/integration-tests/bootstrap-config/application/src/test/java/io/quarkus/it/bootstrap/config/ConfigResourceTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.bootstrap.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.Test; diff --git a/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java b/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java index bf79098f66c7d..0ff2850bcb0ed 100644 --- a/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java +++ b/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java @@ -4,8 +4,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("/jsse") public class BouncyCastleFipsJsseEndpoint { diff --git a/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsEndpoint.java b/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsEndpoint.java index e7731b43ea9b7..b1b2024b8208d 100644 --- a/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsEndpoint.java +++ b/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/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("/jca") public class BouncyCastleFipsEndpoint { diff --git a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java index 301407e748ce9..16a3f3b88e0a8 100644 --- a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java +++ b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java @@ -4,9 +4,9 @@ import java.util.Arrays; import java.util.stream.Collectors; -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.security.identity.SecurityIdentity; diff --git a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java index 076df4ca65a37..a42f30dc3256a 100644 --- a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java +++ b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/SecretProvider.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import io.quarkus.arc.Unremovable; import io.quarkus.credentials.CredentialsProvider; diff --git a/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java b/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java index 2fc505394367b..e0a3f0e3d7055 100644 --- a/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java +++ b/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java @@ -11,8 +11,9 @@ import java.util.stream.Collectors; import javax.crypto.Cipher; -import javax.ws.rs.GET; -import javax.ws.rs.Path; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey; import org.bouncycastle.jcajce.provider.asymmetric.rsa.BCRSAPrivateKey; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java index 10192b5053112..3e3390bc345f5 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java @@ -5,9 +5,9 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import com.github.benmanes.caffeine.cache.CacheLoader; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java index 8339b5b616a81..8efdcf9abfdc0 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.cache; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import io.quarkus.cache.CacheKey; import io.quarkus.cache.CacheResult; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java index 77e2e9dc96e41..0d697777b53ed 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.cache; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java index 22c905b761737..e4d73bf1e0214 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java @@ -1,8 +1,8 @@ package io.quarkus.it.cache; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java index 15555ec0fb19c..88f33b77cfd25 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.cache; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.resteasy.annotations.jaxrs.PathParam; import org.jboss.resteasy.annotations.jaxrs.QueryParam; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/Tree.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/Tree.java index 73ca662df9abd..e82cff4118232 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/Tree.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/Tree.java @@ -1,8 +1,8 @@ package io.quarkus.it.cache; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/TreeResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/TreeResource.java index baf07146277a3..1b46322905c07 100644 --- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/TreeResource.java +++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/TreeResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/class-transformer/deployment/pom.xml b/integration-tests/class-transformer/deployment/pom.xml index 7db6d7a0ec6cf..c3b09d8bfe0c9 100644 --- a/integration-tests/class-transformer/deployment/pom.xml +++ b/integration-tests/class-transformer/deployment/pom.xml @@ -22,8 +22,8 @@ quarkus-integration-test-class-transformer - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/integration-tests/class-transformer/deployment/src/main/java/io/quarkus/it/classtransformer/ClassTransformerProcessor.java b/integration-tests/class-transformer/deployment/src/main/java/io/quarkus/it/classtransformer/ClassTransformerProcessor.java index d927c394a3204..0591954128500 100644 --- a/integration-tests/class-transformer/deployment/src/main/java/io/quarkus/it/classtransformer/ClassTransformerProcessor.java +++ b/integration-tests/class-transformer/deployment/src/main/java/io/quarkus/it/classtransformer/ClassTransformerProcessor.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.function.BiFunction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; diff --git a/integration-tests/common-jpa-entities/src/main/java/io/quarkus/it/common/Clown.java b/integration-tests/common-jpa-entities/src/main/java/io/quarkus/it/common/Clown.java index a442bd4b374f9..535828d4f2617 100644 --- a/integration-tests/common-jpa-entities/src/main/java/io/quarkus/it/common/Clown.java +++ b/integration-tests/common-jpa-entities/src/main/java/io/quarkus/it/common/Clown.java @@ -1,8 +1,8 @@ package io.quarkus.it.common; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Emmanuel Bernard emmanuel@hibernate.org diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-inherit/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/Fruit.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/Fruit.java index bd63d09a4fc25..72dd4c602d87e 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/Fruit.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/Fruit.java @@ -1,14 +1,14 @@ package org.acme; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/FruitResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/FruitResource.java index 9e87f700cfcee..06404ceee72c6 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/FruitResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/src/main/java/org/acme/FruitResource.java @@ -2,10 +2,10 @@ import io.smallrye.common.annotation.Blocking; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.GET; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.persistence.EntityManager; import java.util.List; @Path("fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaEndpoint.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaEndpoint.java index 4d5b30997aca2..d6ecb92655a2a 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaEndpoint.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaEndpoint.java @@ -9,15 +9,15 @@ import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; -import javax.enterprise.context.ApplicationScoped; -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.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.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 java.time.Duration; import java.util.Collections; import java.util.Set; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaProviders.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaProviders.java index 80dee3d42776e..fa7abe8af2049 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaProviders.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/src/main/java/org/acme/kafka/KafkaProviders.java @@ -9,9 +9,9 @@ import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.Map; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/Fruit.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/Fruit.java index bd63d09a4fc25..72dd4c602d87e 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/Fruit.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/Fruit.java @@ -1,14 +1,14 @@ package org.acme; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/FruitResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/FruitResource.java index 9e87f700cfcee..06404ceee72c6 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/FruitResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/src/main/java/org/acme/FruitResource.java @@ -2,10 +2,10 @@ import io.smallrye.common.annotation.Blocking; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.GET; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.persistence.EntityManager; import java.util.List; @Path("fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/src/main/java/org/acme/FruitResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/src/main/java/org/acme/FruitResource.java index fc153bd9be5e8..3275c95b152fc 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/src/main/java/org/acme/FruitResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/src/main/java/org/acme/FruitResource.java @@ -2,9 +2,9 @@ import io.smallrye.mutiny.Uni; -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 java.util.List; import org.bson.Document; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/Fruit.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/Fruit.java index bd63d09a4fc25..72dd4c602d87e 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/Fruit.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/Fruit.java @@ -1,14 +1,14 @@ package org.acme; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/FruitResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/FruitResource.java index 9e87f700cfcee..06404ceee72c6 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/FruitResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/src/main/java/org/acme/FruitResource.java @@ -2,10 +2,10 @@ import io.smallrye.common.annotation.Blocking; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.GET; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.persistence.EntityManager; import java.util.List; @Path("fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/Fruit.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/Fruit.java index bd63d09a4fc25..72dd4c602d87e 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/Fruit.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/Fruit.java @@ -1,14 +1,14 @@ package org.acme; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/FruitResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/FruitResource.java index 9e87f700cfcee..06404ceee72c6 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/FruitResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/src/main/java/org/acme/FruitResource.java @@ -2,10 +2,10 @@ import io.smallrye.common.annotation.Blocking; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.GET; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.persistence.EntityManager; import java.util.List; @Path("fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/Fruit.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/Fruit.java index bd63d09a4fc25..72dd4c602d87e 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/Fruit.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/Fruit.java @@ -1,14 +1,14 @@ package org.acme; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/FruitResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/FruitResource.java index 9e87f700cfcee..06404ceee72c6 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/FruitResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/src/main/java/org/acme/FruitResource.java @@ -2,10 +2,10 @@ import io.smallrye.common.annotation.Blocking; -import javax.inject.Inject; -import javax.ws.rs.Path; -import javax.ws.rs.GET; -import javax.persistence.EntityManager; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.persistence.EntityManager; import java.util.List; @Path("fruits") diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/java/org/acme/Hello.java index ecb6d4d3010cb..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/AdminResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/AdminResource.java index ab489210e5802..1665732feafe8 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/AdminResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/AdminResource.java @@ -1,10 +1,10 @@ package org.acme.security.openid.connect; -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; import io.quarkus.security.Authenticated; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/UsersResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/UsersResource.java index 0c1eb33448194..99178c08db7d7 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/UsersResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/src/main/java/org/acme/security/openid/connect/UsersResource.java @@ -1,11 +1,11 @@ package org.acme.security.openid.connect; -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.jboss.resteasy.reactive.NoCache; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/AdminResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/AdminResource.java index ab489210e5802..1665732feafe8 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/AdminResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/AdminResource.java @@ -1,10 +1,10 @@ package org.acme.security.openid.connect; -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; import io.quarkus.security.Authenticated; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/UsersResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/UsersResource.java index 0c1eb33448194..99178c08db7d7 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/UsersResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/src/main/java/org/acme/security/openid/connect/UsersResource.java @@ -1,11 +1,11 @@ package org.acme.security.openid.connect; -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.jboss.resteasy.reactive.NoCache; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementResource.java b/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementResource.java index 04cfebfe66532..92cf7e5cb4a08 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementResource.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementResource.java @@ -1,15 +1,15 @@ package org.acme.redis; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.PathParam; -import javax.ws.rs.PUT; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.Path; -import javax.ws.rs.POST; -import javax.ws.rs.DELETE; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.core.MediaType; import java.util.List; import io.smallrye.common.annotation.Blocking; diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementService.java b/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementService.java index ddc2124a95162..07b09d0ae4674 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementService.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/src/main/java/org/acme/redis/IncrementService.java @@ -4,7 +4,7 @@ import io.quarkus.redis.datasource.keys.KeyCommands; import io.quarkus.redis.datasource.value.ValueCommands; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import java.util.List; @Singleton diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/src/main/java/org/acme/Hello.java +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/container-image/quarkus-standard-way/src/main/java/io/quarkus/it/container/image/GreetingResource.java b/integration-tests/container-image/quarkus-standard-way/src/main/java/io/quarkus/it/container/image/GreetingResource.java index 0c661214e9855..ea03190819fa1 100644 --- a/integration-tests/container-image/quarkus-standard-way/src/main/java/io/quarkus/it/container/image/GreetingResource.java +++ b/integration-tests/container-image/quarkus-standard-way/src/main/java/io/quarkus/it/container/image/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.container.image; -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/integration-tests/csrf-reactive/src/main/java/io/quarkus/it/csrf/TestResource.java b/integration-tests/csrf-reactive/src/main/java/io/quarkus/it/csrf/TestResource.java index d882897fcb82f..c509b97cfe6b5 100644 --- a/integration-tests/csrf-reactive/src/main/java/io/quarkus/it/csrf/TestResource.java +++ b/integration-tests/csrf-reactive/src/main/java/io/quarkus/it/csrf/TestResource.java @@ -2,16 +2,16 @@ import java.io.File; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -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.Cookie; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +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.Cookie; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.resteasy.reactive.RestForm; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java index 4bf054ae3ec32..d8957571d7a18 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleArcSmokeTest.java @@ -1,8 +1,8 @@ package io.quarkus.test.devconsole; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Named; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java index 1ecfb64229cb0..b61ed568f08d1 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleCacheSmokeTest.java @@ -1,6 +1,6 @@ package io.quarkus.test.devconsole; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DummyConnector.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DummyConnector.java index 000b708afaccc..2bc3f3688b065 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DummyConnector.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DummyConnector.java @@ -1,6 +1,6 @@ package io.quarkus.test.devconsole; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyEntity.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyEntity.java index 7ab8614f558e3..02e4de6f0fd29 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyEntity.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyEntity.java @@ -1,8 +1,8 @@ package io.quarkus.test.devconsole; -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 MyEntity { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyIndexedEntity.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyIndexedEntity.java index 4b6cc44b50908..8919ea3a6f784 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyIndexedEntity.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyIndexedEntity.java @@ -1,7 +1,7 @@ package io.quarkus.test.devconsole; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyProcessor.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyProcessor.java index e6da780f8ef52..d9a63239dff43 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyProcessor.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyProcessor.java @@ -1,16 +1,15 @@ package io.quarkus.test.devconsole; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import java.util.concurrent.Flow; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import org.reactivestreams.Publisher; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; import io.smallrye.reactive.messaging.annotations.Broadcast; import io.vertx.core.http.HttpServerResponse; @@ -21,14 +20,14 @@ public class MyProcessor { @Inject @Channel("processed") - Instance> channel; + Instance> channel; public void init(@Observes Router router) { router.get().handler(rc -> { HttpServerResponse response = rc.response(); - channel.get().subscribe(new Subscriber() { + channel.get().subscribe(new Flow.Subscriber() { @Override - public void onSubscribe(Subscription subscription) { + public void onSubscribe(Flow.Subscription subscription) { response.putHeader("Transfer-encoding", "chunked"); subscription.request(2); } diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyResource.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyResource.java index d372752abd26b..0c25eb057a8cb 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyResource.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyResource.java @@ -1,9 +1,9 @@ package io.quarkus.test.devconsole; -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("/me") public class MyResource { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuEntity.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuEntity.java index cb718cb0d24eb..203edc992a168 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuEntity.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuEntity.java @@ -1,7 +1,7 @@ package io.quarkus.test.devconsole.namedpu; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MyNamedPuEntity { diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuIndexedEntity.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuIndexedEntity.java index 396bae2917a38..3bb2b7aa182e7 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuIndexedEntity.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/namedpu/MyNamedPuIndexedEntity.java @@ -1,7 +1,7 @@ package io.quarkus.test.devconsole.namedpu; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainResource.java b/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainResource.java index 238dead94184f..9941538139290 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainResource.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/no/src/main/NoSrcMainResource.java @@ -1,9 +1,9 @@ package io.quarkus.test.no.src.main; -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.config.inject.ConfigProperty; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/qute/QuteErrorPageTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/qute/QuteErrorPageTest.java index effa9b27abe78..87a02b2865aba 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/qute/QuteErrorPageTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/qute/QuteErrorPageTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.CoreMatchers.containsString; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesResource.java b/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesResource.java index c79c65bb6945f..ac6f540a72c31 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesResource.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/reload/AdditionalWatchedResourcesResource.java @@ -6,12 +6,12 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -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.enterprise.context.ApplicationScoped; +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.apache.commons.io.IOUtils; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/security/DisabledAuthorizationTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/security/DisabledAuthorizationTest.java index f2ef5d1775d63..0f7c81aacc0e6 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/security/DisabledAuthorizationTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/security/DisabledAuthorizationTest.java @@ -2,10 +2,10 @@ import static org.hamcrest.CoreMatchers.equalTo; -import javax.annotation.security.DenyAll; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.DenyAll; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java index 06c2752684d2c..dfeb168f986ea 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/ConsumeUuidEventHotReloadTest.java @@ -3,9 +3,9 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java index 595d107b438d6..8b5f068de4d54 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleClassnameHotReloadTest.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java index 37ed36b3ecec5..028a6624b70c0 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/MutinyVerticleInstanceHotReloadTest.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/UuidMessageConsumer.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/UuidMessageConsumer.java index 37ccb06b7111d..56588ed9cada9 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/UuidMessageConsumer.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/UuidMessageConsumer.java @@ -2,7 +2,7 @@ import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.ConsumeEvent; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java index d3fceb2cdaa0f..9f61f921bcd0f 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleClassnameHotReloadTest.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java index 40eb5642ff1cd..2a120f11fa56d 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/vertx/VerticleInstanceHotReloadTest.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -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.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/devtools-registry-client/src/main/java/io/quarkus/registry/RegistryConfigResource.java b/integration-tests/devtools-registry-client/src/main/java/io/quarkus/registry/RegistryConfigResource.java index 1e7a1c246258a..ca4892f343670 100644 --- a/integration-tests/devtools-registry-client/src/main/java/io/quarkus/registry/RegistryConfigResource.java +++ b/integration-tests/devtools-registry-client/src/main/java/io/quarkus/registry/RegistryConfigResource.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.io.StringWriter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.HttpHeaders; -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.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import io.quarkus.registry.config.RegistriesConfigMapperHelper; import io.quarkus.registry.config.RegistryConfig; diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingFunctions.java b/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingFunctions.java index 28e657f4b17cd..9e5fe1dea467f 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingFunctions.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingFunctions.java @@ -1,6 +1,6 @@ package ilove.quark.us.funqygooglecloudfunctions; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.cloudevents.CloudEvent; import io.quarkus.funqy.Funq; diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingService.java b/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingService.java index 282f37dba7833..366d98b341341 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingService.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/FunqyGoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_funqygooglecloudfunctions_GreetingService.java @@ -1,6 +1,6 @@ package ilove.quark.us.funqygooglecloudfunctions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldBackgroundFunction.java b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldBackgroundFunction.java index 85f58424c8f2f..d0f03f37bcadc 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldBackgroundFunction.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldBackgroundFunction.java @@ -1,6 +1,6 @@ package ilove.quark.us.googlecloudfunctions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.cloud.functions.BackgroundFunction; import com.google.cloud.functions.Context; @@ -16,4 +16,4 @@ public void accept(StorageEvent event, Context context) throws Exception { public static class StorageEvent { public String name; } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldCloudEventsFunction.java b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldCloudEventsFunction.java index e2228257ce100..322009f06137f 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldCloudEventsFunction.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldCloudEventsFunction.java @@ -1,6 +1,6 @@ package ilove.quark.us.googlecloudfunctions; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.cloud.functions.CloudEventsFunction; @@ -16,4 +16,4 @@ public void accept(CloudEvent cloudEvent) throws Exception { System.out.println("Receive event Type: " + cloudEvent.getType()); System.out.println("Receive event Data: " + new String(cloudEvent.getData().toBytes())); } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldHttpFunction.java b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldHttpFunction.java index c03a2b50b7603..85af3718f9c0e 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldHttpFunction.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_HelloWorldHttpFunction.java @@ -2,7 +2,7 @@ import java.io.Writer; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.cloud.functions.HttpFunction; import com.google.cloud.functions.HttpRequest; @@ -16,4 +16,4 @@ public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws E Writer writer = httpResponse.getWriter(); writer.write("Hello World"); } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingResource.java index 8c8ceaa674cba..e95daab189afc 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingResource.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingResource.java @@ -1,11 +1,11 @@ package ilove.quark.us.googlecloudfunctionshttp; -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; @Path("/hello") public class GreetingResource { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingServlet.java b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingServlet.java index 03abceccb3b90..207cf28c54446 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingServlet.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/GoogleCloudFunctionsHttpCodestartTest/testContent/src_main_java_ilove_quark_us_googlecloudfunctions_GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java index 09329e1879b2b..16a147f0dba93 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java @@ -1,8 +1,8 @@ package ilove.quark.us; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * Example JPA entity. diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt index ae6ca99d523eb..738ea41f68c91 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt @@ -1,8 +1,8 @@ package ilove.quark.us -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id /** * Example JPA entity. diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java index 7af15a045441e..e75f117fb82b2 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheCodestartIT/testContent/src_main_java_ilove_quark_us_MyEntity.java @@ -1,7 +1,7 @@ package ilove.quark.us; import io.quarkus.hibernate.orm.panache.PanacheEntity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheKotlinCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheKotlinCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt index 0c21af1ce75f3..f5213796f3478 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheKotlinCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/HibernateOrmPanacheKotlinCodestartIT/testContent/src_main_kotlin_ilove_quark_us_MyKotlinEntity.kt @@ -2,7 +2,7 @@ package ilove.quark.us import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion -import javax.persistence.Entity +import jakarta.persistence.Entity /** * Example JPA entity defined as a Kotlin Panache Entity. diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_java_ilove_quark_us_MyRemoteService.java b/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_java_ilove_quark_us_MyRemoteService.java index e29ea39c21821..242a4e69e8b56 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_java_ilove_quark_us_MyRemoteService.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_java_ilove_quark_us_MyRemoteService.java @@ -2,9 +2,9 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import java.util.List; import java.util.Set; diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyRemoteService.kt b/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyRemoteService.kt index dfa6647a35370..dacb1f3671c37 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyRemoteService.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTClientCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyRemoteService.kt @@ -1,9 +1,9 @@ package ilove.quark.us import org.eclipse.microprofile.rest.client.inject.RegisterRestClient -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.QueryParam +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.QueryParam /** * To use it via injection. diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_java_ilove_quark_us_SomePage.java b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_java_ilove_quark_us_SomePage.java index b51406a5360dd..de2099eb4096a 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_java_ilove_quark_us_SomePage.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_java_ilove_quark_us_SomePage.java @@ -2,11 +2,11 @@ import io.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; -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 static java.util.Objects.requireNonNull; diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt index 6b3690d2666a9..f0a8fc03e6e4c 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyQuteCodestartTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt @@ -2,11 +2,11 @@ package ilove.quark.us import io.quarkus.qute.Template import io.quarkus.qute.TemplateInstance -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 @Path("/some-page") class SomePage(val page: Template) { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java index c65c013da3d95..382f19a13488c 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java @@ -1,9 +1,9 @@ package ilove.quark.us; -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 GreetingResource { @@ -13,4 +13,4 @@ public class GreetingResource { public String hello() { return "Hello from RESTEasy Reactive"; } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_SomePage.java b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_SomePage.java index ef4e4eee16f73..737419067e74c 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_SomePage.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_java_ilove_quark_us_SomePage.java @@ -3,11 +3,11 @@ import io.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; -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 static java.util.Objects.requireNonNull; diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt index 142f19634d0b4..14985fe82c9f0 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt @@ -1,9 +1,9 @@ package ilove.quark.us -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") class GreetingResource { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt index 82cca6e2d376d..fa99b22b3668e 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/RESTEasyReactiveCodestartsTest/testContent/src_main_kotlin_ilove_quark_us_SomePage.kt @@ -2,11 +2,11 @@ package ilove.quark.us import io.quarkus.qute.Template import io.quarkus.qute.TemplateInstance -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 @Path("/some-page") class SomePage(val page: Template) { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java index 7e428ad3806fb..1b6e4b05161cf 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java @@ -3,9 +3,9 @@ import io.quarkus.runtime.StartupEvent; import org.eclipse.microprofile.reactive.messaging.*; -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 java.util.stream.Stream; @ApplicationScoped diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java index 557c9bfcf685e..6f0a5ac2895ca 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testAMQPContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.reactive.messaging.Message; import org.junit.jupiter.api.Test; -import javax.inject.Inject; +import jakarta.inject.Inject; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,4 +22,4 @@ void test() { assertEquals("HELLO", application.toUpperCase(Message.of("Hello")).getPayload()); assertEquals("BONJOUR", application.toUpperCase(Message.of("bonjour")).getPayload()); } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java index 7e428ad3806fb..1b6e4b05161cf 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_main_java_ilove_quark_us_MyReactiveMessagingApplication.java @@ -3,9 +3,9 @@ import io.quarkus.runtime.StartupEvent; import org.eclipse.microprofile.reactive.messaging.*; -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 java.util.stream.Stream; @ApplicationScoped diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java index 557c9bfcf685e..6f0a5ac2895ca 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveMessagingCodestartIT/testKafkaContent/src_test_java_ilove_quark_us_MyReactiveMessagingApplicationTest.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.reactive.messaging.Message; import org.junit.jupiter.api.Test; -import javax.inject.Inject; +import jakarta.inject.Inject; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,4 +22,4 @@ void test() { assertEquals("HELLO", application.toUpperCase(Message.of("Hello")).getPayload()); assertEquals("BONJOUR", application.toUpperCase(Message.of("bonjour")).getPayload()); } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_java_ilove_quark_us_MyDeclarativeRoutes.java b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_java_ilove_quark_us_MyDeclarativeRoutes.java index 03909be4cc3e3..cfe26cfc4cacf 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_java_ilove_quark_us_MyDeclarativeRoutes.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_java_ilove_quark_us_MyDeclarativeRoutes.java @@ -1,6 +1,6 @@ package ilove.quark.us; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RoutingExchange; @@ -13,4 +13,4 @@ public class MyDeclarativeRoutes { void helloRoute(RoutingExchange ex) { ex.ok("Hello " + ex.getParam("name").orElse("Reactive Route") +" !!"); } -} \ No newline at end of file +} diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyDeclarativeRoutes.kt b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyDeclarativeRoutes.kt index 6e5f974dbba66..b4ddd041fa47d 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyDeclarativeRoutes.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/ReactiveRoutesCodestartTest/testContent/src_main_kotlin_ilove_quark_us_MyDeclarativeRoutes.kt @@ -3,7 +3,7 @@ package ilove.quark.us import io.quarkus.vertx.web.Route import io.quarkus.vertx.web.RoutingExchange import io.vertx.ext.web.RoutingContext -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class MyDeclarativeRoutes { diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_java_ilove_quark_us_StartWebSocket.java b/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_java_ilove_quark_us_StartWebSocket.java index f01294b0465de..6e4522574874c 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_java_ilove_quark_us_StartWebSocket.java +++ b/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_java_ilove_quark_us_StartWebSocket.java @@ -1,14 +1,14 @@ package ilove.quark.us; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.EncodeException; -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.EncodeException; +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 java.io.IOException; import static java.util.Objects.requireNonNull; diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_kotlin_ilove_quark_us_StartWebSocket.kt b/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_kotlin_ilove_quark_us_StartWebSocket.kt index a738cb3e8a5eb..9af11d1d7b25d 100644 --- a/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_kotlin_ilove_quark_us_StartWebSocket.kt +++ b/integration-tests/devtools/src/test/resources/__snapshots__/WebSocketsCodestartTest/testContent/src_main_kotlin_ilove_quark_us_StartWebSocket.kt @@ -1,9 +1,9 @@ package ilove.quark.us -import javax.enterprise.context.ApplicationScoped -import javax.websocket.* -import javax.websocket.server.PathParam -import javax.websocket.server.ServerEndpoint +import jakarta.enterprise.context.ApplicationScoped +import jakarta.websocket.* +import jakarta.websocket.server.PathParam +import jakarta.websocket.server.ServerEndpoint @ApplicationScoped @ServerEndpoint("/start-websocket/{name}") diff --git a/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java b/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java index 268f7a1ca07af..4cec914a9ae37 100644 --- a/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java +++ b/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java @@ -5,14 +5,14 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -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 javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +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 jakarta.ws.rs.core.Response; @Path("/fruits") public class FruitResource { diff --git a/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitService.java b/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitService.java index fe5140c6c6136..aba58dad86b04 100644 --- a/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitService.java +++ b/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitService.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.apache.http.util.EntityUtils; import org.elasticsearch.client.Request; diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java index fe4bbd3c8d46b..559dad17d1043 100644 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java +++ b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java @@ -5,14 +5,14 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -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 javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +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 jakarta.ws.rs.core.Response; @Path("/fruits") public class FruitResource { diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java index bb1c7c2566fcb..b00f350b555ac 100644 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java +++ b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; diff --git a/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/AuthenticationFailedExceptionMapper.java b/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/AuthenticationFailedExceptionMapper.java index 798301535e71d..71eb58267b2ee 100644 --- a/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/AuthenticationFailedExceptionMapper.java +++ b/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/AuthenticationFailedExceptionMapper.java @@ -1,10 +1,10 @@ package io.quarkus.it.resteasy.reactive.elytron; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.quarkus.security.AuthenticationFailedException; diff --git a/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/FruitResource.java b/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/FruitResource.java index ec1ba83150f91..ce9a8b7a8d7e4 100644 --- a/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/FruitResource.java +++ b/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/FruitResource.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.resteasy.reactive.jackson.DisableSecureSerialization; diff --git a/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/RootResource.java b/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/RootResource.java index 5cf108735b179..23bd635a83635 100644 --- a/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/RootResource.java +++ b/integration-tests/elytron-resteasy-reactive/src/main/java/io/quarkus/it/resteasy/reactive/elytron/RootResource.java @@ -3,16 +3,16 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.security.RolesAllowed; -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.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; import io.quarkus.security.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/AuthFailedExceptionMapper.java b/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/AuthFailedExceptionMapper.java index 3cb80fe37991a..c4b2505b703ad 100644 --- a/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/AuthFailedExceptionMapper.java +++ b/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/AuthFailedExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.it.resteasy.elytron; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.quarkus.security.AuthenticationFailedException; diff --git a/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/RootResource.java b/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/RootResource.java index 02a1cf2d25f77..11e6a1d3675b7 100644 --- a/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/RootResource.java +++ b/integration-tests/elytron-resteasy/src/main/java/io/quarkus/it/resteasy/elytron/RootResource.java @@ -4,16 +4,16 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.security.RolesAllowed; -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.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; import io.quarkus.security.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java b/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java index 09f1bc9c14a20..e32af89f9e29e 100644 --- a/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java +++ b/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java @@ -16,10 +16,10 @@ */ package io.quarkus.elytron.security.jdbc.it; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/api") @ApplicationScoped diff --git a/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java b/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java index 52c5726f6027c..17ca851fdd315 100644 --- a/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java +++ b/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java @@ -16,10 +16,10 @@ */ package io.quarkus.elytron.security.ldap.it; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/api") @ApplicationScoped diff --git a/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java b/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java index f1acf2fa1934a..ba38280e9358c 100644 --- a/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java +++ b/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.elytron.oauth2; -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("/api") public class ElytronOauth2ExtensionResource { diff --git a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java index fe4e491ea085d..9e52a3963606e 100644 --- a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java +++ b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java @@ -8,9 +8,9 @@ import java.security.spec.X509EncodedKeySpec; import java.util.Base64; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.jboss.logging.Logger; diff --git a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalEndpoint.java b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalEndpoint.java index e78ccbb4d7535..dc34b19fe9350 100644 --- a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalEndpoint.java +++ b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalEndpoint.java @@ -1,11 +1,12 @@ package io.quarkus.it.elytron; -import javax.inject.Inject; import javax.security.auth.x500.X500Principal; -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("/x500") public class X500PrincipalEndpoint { diff --git a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalUtilUser.java b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalUtilUser.java index 3a645352644a5..a24ee64659dd8 100644 --- a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalUtilUser.java +++ b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/X500PrincipalUtilUser.java @@ -2,10 +2,11 @@ import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; import javax.security.auth.x500.X500Principal; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; + import org.wildfly.security.x500.util.X500PrincipalUtil; /** diff --git a/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/AnnotationSecurityServlet.java b/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/AnnotationSecurityServlet.java index 5b92bee086db2..83de1d64f8f39 100644 --- a/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/AnnotationSecurityServlet.java +++ b/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/AnnotationSecurityServlet.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.HttpMethodConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.HttpMethodConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "AnnotationSecurityServlet", urlPatterns = "/annotation-secure") @ServletSecurity(value = @HttpConstraint(rolesAllowed = "managers"), httpMethodConstraints = { diff --git a/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/GreetingServlet.java b/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/GreetingServlet.java index d8ee67439d697..c74c7f591023e 100644 --- a/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/GreetingServlet.java +++ b/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/*") public class GreetingServlet extends HttpServlet { diff --git a/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/RootResource.java b/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/RootResource.java index 0f14f12cf336a..c15c8c3a58342 100644 --- a/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/RootResource.java +++ b/integration-tests/elytron-undertow/src/main/java/io/quarkus/it/undertow/elytron/RootResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.undertow.elytron; -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.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +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.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; @Path("/rest") public class RootResource { diff --git a/integration-tests/elytron-undertow/src/main/resources/META-INF/web.xml b/integration-tests/elytron-undertow/src/main/resources/META-INF/web.xml index 33a8ec5f2053e..e4040e6d2096e 100644 --- a/integration-tests/elytron-undertow/src/main/resources/META-INF/web.xml +++ b/integration-tests/elytron-undertow/src/main/resources/META-INF/web.xml @@ -6,7 +6,7 @@ metadata-complete="false"> - javax.ws.rs.core.Application + jakarta.ws.rs.core.Application /mapped/* diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java index ee2446424124e..36853f22d76d2 100644 --- a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java +++ b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Entity used within tests diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayApp.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayApp.java index a6f43273a9ce6..3e0ced6494a5f 100644 --- a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayApp.java +++ b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayApp.java @@ -1,7 +1,7 @@ package io.quarkus.it.flyway; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/flyway") public class FlywayApp extends Application { diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java index 7661d9bc90ff3..5c72b0b721dad 100644 --- a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java +++ b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java @@ -3,10 +3,10 @@ import java.util.Map; import java.util.Objects; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationVersion; diff --git a/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingFunctions.java b/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingFunctions.java index e860c7a2c4c21..eeb69c7123d54 100644 --- a/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingFunctions.java +++ b/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingFunctions.java @@ -4,7 +4,7 @@ import java.util.Timer; import java.util.TimerTask; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.funqy.Funq; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingService.java b/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingService.java index 5f20bdb0a7ab0..3ad7c6dc10bd5 100644 --- a/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingService.java +++ b/integration-tests/funqy-amazon-lambda/src/main/java/io/quarkus/funqy/test/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingFunctions.java b/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingFunctions.java index c7e1bb98ad909..6a1f8b11e802b 100644 --- a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingFunctions.java +++ b/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingFunctions.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.gcp.functions.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.cloudevents.CloudEvent; import io.quarkus.funqy.Funq; diff --git a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingService.java b/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingService.java index 5d6d0f329c6b4..91b69ae789bc3 100644 --- a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingService.java +++ b/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.gcp.functions.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingResource.java b/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingResource.java index e506bc37f7e49..4104e5f596ad3 100644 --- a/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingResource.java +++ b/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.gcp.functions.http; -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; @Path("/hello") public class GreetingResource { diff --git a/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingServlet.java b/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingServlet.java index 1065e3f6499e0..4b84cba5aaca8 100644 --- a/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingServlet.java +++ b/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/BackgroundFunctionStorageTest.java b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/BackgroundFunctionStorageTest.java index f6b438d5012b6..43bbd33bd4466 100644 --- a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/BackgroundFunctionStorageTest.java +++ b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/BackgroundFunctionStorageTest.java @@ -1,8 +1,8 @@ package io.quarkus.gcp.function.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.BackgroundFunction; import com.google.cloud.functions.Context; diff --git a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/CloudEventStorageTest.java b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/CloudEventStorageTest.java index 9d2c358600ffb..99b6d5eec97e0 100644 --- a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/CloudEventStorageTest.java +++ b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/CloudEventStorageTest.java @@ -1,8 +1,8 @@ package io.quarkus.gcp.function.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.CloudEventsFunction; diff --git a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/HttpFunctionTest.java b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/HttpFunctionTest.java index 39afcad2d34c3..df1d82b64ade8 100644 --- a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/HttpFunctionTest.java +++ b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/HttpFunctionTest.java @@ -2,9 +2,9 @@ import java.io.Writer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.HttpFunction; import com.google.cloud.functions.HttpRequest; diff --git a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/RawBackgroundFunctionPubSubTest.java b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/RawBackgroundFunctionPubSubTest.java index 7f5a6d27ef729..c761d259ba5f0 100644 --- a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/RawBackgroundFunctionPubSubTest.java +++ b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/RawBackgroundFunctionPubSubTest.java @@ -1,8 +1,8 @@ package io.quarkus.gcp.function.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import com.google.cloud.functions.Context; import com.google.cloud.functions.RawBackgroundFunction; diff --git a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/service/GreetingService.java b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/service/GreetingService.java index e2fa6596f31a1..81b8bed85ab85 100644 --- a/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/service/GreetingService.java +++ b/integration-tests/google-cloud-functions/src/main/java/io/quarkus/gcp/function/test/service/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.gcp.function.test.service; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 092d251dc1ebb..1d723a4410ac0 100644 --- a/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.common.CommonBean; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + common.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/add-extension-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/add-extension-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 092d251dc1ebb..1d723a4410ac0 100644 --- a/integration-tests/gradle/src/main/resources/add-extension-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/add-extension-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.common.CommonBean; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + common.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/add-extension-multi-module/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/add-extension-multi-module/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/add-extension-multi-module/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/add-extension-multi-module/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java index a4df5d8d739aa..681d44e012b3c 100644 --- a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class ExampleResource { @@ -14,4 +14,4 @@ public class ExampleResource { public String hello() { return "Hello from Test"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java index a4df5d8d739aa..681d44e012b3c 100644 --- a/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class ExampleResource { @@ -14,4 +14,4 @@ public class ExampleResource { public String hello() { return "Hello from Test"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java b/integration-tests/gradle/src/main/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java index a8a62620dd554..18886ea098262 100644 --- a/integration-tests/gradle/src/main/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java +++ b/integration-tests/gradle/src/main/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java @@ -1,6 +1,6 @@ package ft; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/gradle/src/main/resources/additional-source-sets/src/main/java/ft/SimpleBean.java b/integration-tests/gradle/src/main/resources/additional-source-sets/src/main/java/ft/SimpleBean.java index 7dbf40c55c6a6..d39a079c2a48c 100644 --- a/integration-tests/gradle/src/main/resources/additional-source-sets/src/main/java/ft/SimpleBean.java +++ b/integration-tests/gradle/src/main/resources/additional-source-sets/src/main/java/ft/SimpleBean.java @@ -1,6 +1,6 @@ package ft; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SimpleBean { diff --git a/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 742b10f2bbc60..dfb3fec894c1f 100644 --- a/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/annotation-processor-multi-module/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,9 +1,9 @@ package org.acme.quarkus.sample; -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.acme.common.CarMapper; import org.acme.common.domain.Car; @@ -18,4 +18,4 @@ public CarDTO hello() { Car car = new Car("foo", 4); return CarMapper.INSTANCE.carToCarDTO(car); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/sample/HelloResource.java index 42d1a37e426f4..b4ea8f6b626cf 100644 --- a/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/annotation-processor-simple-module/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,9 +1,9 @@ package org.acme.quarkus.sample; -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.acme.quarkus.CarMapper; import org.acme.quarkus.domain.Car; @@ -18,4 +18,4 @@ public CarDTO hello() { Car car = new Car("foo", 4); return CarMapper.INSTANCE.carToCarDTO(car); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/avro-simple-project/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/avro-simple-project/src/main/java/org/acme/quarkus/sample/HelloResource.java index b885722662d1c..304b951fe17bc 100644 --- a/integration-tests/gradle/src/main/resources/avro-simple-project/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/avro-simple-project/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -4,10 +4,10 @@ import java.util.Arrays; -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.acme.quarkus.hello.Provider; @@ -19,4 +19,4 @@ public class HelloResource { public String providerValues() { return Arrays.stream(Provider.values()).map(String::valueOf).collect(joining(",")); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 6034c1428940e..69c983c7cdfa3 100644 --- a/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.libb.LibB; import org.acme.liba.LibA; @@ -26,4 +26,4 @@ public class HelloResource { public String hello() { return "hello from " + libB.getName()+" and "+libA.getName()+" extension enabled: "+config.enabled; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java b/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java index eb5be23dd06a4..c53c4b62666a1 100644 --- a/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java +++ b/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java @@ -1,6 +1,6 @@ package org.acme.liba; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LibA{ @@ -9,4 +9,4 @@ public String getName(){ return "LibA"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java b/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java index 0ca86ba004a60..b84b4a9ae4eb8 100644 --- a/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java +++ b/integration-tests/gradle/src/main/resources/basic-composite-build-extension-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java @@ -1,7 +1,7 @@ package org.acme.libb; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class LibB{ @@ -9,4 +9,4 @@ public class LibB{ public String getName(){ return "LibB"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-composite-build-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/basic-composite-build-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 6aa57377be8c1..b2675f57c1d9b 100644 --- a/integration-tests/gradle/src/main/resources/basic-composite-build-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/basic-composite-build-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.libb.LibB; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + libB.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java b/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java index eb5be23dd06a4..c53c4b62666a1 100644 --- a/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java +++ b/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryA/src/main/java/org/acme/liba/LibA.java @@ -1,6 +1,6 @@ package org.acme.liba; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LibA{ @@ -9,4 +9,4 @@ public String getName(){ return "LibA"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java b/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java index fc97d2cb388c8..ac30ed8897ccb 100644 --- a/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java +++ b/integration-tests/gradle/src/main/resources/basic-composite-build-project/libraries/libraryB/src/main/java/org/acme/libb/LibB.java @@ -1,8 +1,8 @@ package org.acme.libb; import org.acme.liba.LibA; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class LibB{ @@ -13,4 +13,4 @@ public class LibB{ public String getName(){ return libA.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java index 69a905bf38a8f..94ec314e98050 100644 --- a/integration-tests/gradle/src/main/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java @@ -1,9 +1,9 @@ package org.acme; -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 ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ApplicationConfigResource.java b/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ApplicationConfigResource.java index ca578869780f9..82145f3a5c3d7 100644 --- a/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ApplicationConfigResource.java +++ b/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ApplicationConfigResource.java @@ -3,10 +3,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/app-config") public class ApplicationConfigResource { diff --git a/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ExampleResource.java index 4e1fe19332924..bf843c8b43bb3 100644 --- a/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/basic-java-library-module/application/src/main/java/org/acme/ExampleResource.java @@ -2,11 +2,11 @@ import io.fabric8.kubernetes.client.KubernetesClient; -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("/hello") public class ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/basic-java-library-module/library/src/main/java/org/acme/BeanWithInjection.java b/integration-tests/gradle/src/main/resources/basic-java-library-module/library/src/main/java/org/acme/BeanWithInjection.java index 0811596b41712..cffcb9c789129 100644 --- a/integration-tests/gradle/src/main/resources/basic-java-library-module/library/src/main/java/org/acme/BeanWithInjection.java +++ b/integration-tests/gradle/src/main/resources/basic-java-library-module/library/src/main/java/org/acme/BeanWithInjection.java @@ -2,8 +2,8 @@ import io.fabric8.kubernetes.client.KubernetesClient; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BeanWithInjection { diff --git a/integration-tests/gradle/src/main/resources/basic-java-native-module/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/main/resources/basic-java-native-module/src/main/java/org/acme/HelloResource.java index 89804c62b5e24..fbb27b57b28fc 100644 --- a/integration-tests/gradle/src/main/resources/basic-java-native-module/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/basic-java-native-module/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { @@ -13,4 +13,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/java/org/acme/ExampleResource.java index ba3a5b31b8f14..0626a88a027ed 100644 --- a/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/basic-java-platform-module/application/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt index 7634ba1421904..184166010098e 100644 --- a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt +++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt @@ -1,9 +1,9 @@ package org.acme -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") class GreetingResource { diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/application/src/main/java/com/demo/application/Application.java b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/application/src/main/java/com/demo/application/Application.java index 86b1890203d40..cc7db59db6c0e 100644 --- a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/application/src/main/java/com/demo/application/Application.java +++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/application/src/main/java/com/demo/application/Application.java @@ -1,9 +1,9 @@ package com.demo.application; import com.demo.common.base.model.BaseEntity; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.inject.Inject; @ApplicationScoped public class Application { diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-one/src/main/java/com/demo/common/one/model/SharedModelOne.java b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-one/src/main/java/com/demo/common/one/model/SharedModelOne.java index 869e28ae85d55..d6e820e9472e1 100644 --- a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-one/src/main/java/com/demo/common/one/model/SharedModelOne.java +++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-one/src/main/java/com/demo/common/one/model/SharedModelOne.java @@ -2,9 +2,9 @@ import com.demo.common.base.model.BaseEntity; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Singleton; @Alternative @Priority(1) diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-two/src/main/java/com/demo/common/two/model/SharedModelTwo.java b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-two/src/main/java/com/demo/common/two/model/SharedModelTwo.java index 8318fecb54696..b1dca8b06c419 100644 --- a/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-two/src/main/java/com/demo/common/two/model/SharedModelTwo.java +++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project-test-setup/common-two/src/main/java/com/demo/common/two/model/SharedModelTwo.java @@ -2,9 +2,9 @@ import com.demo.common.base.model.BaseEntity; -import javax.annotation.Priority; -import javax.enterprise.inject.Alternative; -import javax.inject.Singleton; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Singleton; @Singleton public class SharedModelTwo implements BaseEntity { diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 092d251dc1ebb..1d723a4410ac0 100644 --- a/integration-tests/gradle/src/main/resources/basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.common.CommonBean; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + common.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle index f1918d0e21491..00c07225c882a 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle @@ -27,8 +27,8 @@ group 'org.acme' version '1.0.0-SNAPSHOT' allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java index a4df5d8d739aa..681d44e012b3c 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class ExampleResource { @@ -14,4 +14,4 @@ public class ExampleResource { public String hello() { return "Hello from Test"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt index 83d18985d4fd4..afd349a1ca1ff 100644 --- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt +++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt @@ -1,9 +1,9 @@ package org.acme.test -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("/test-resources") class ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/build-configuration/with-application-properties/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/build-configuration/with-build-configuration/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/build-configuration/without-configuration/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java b/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java index 6a80730c76ac6..8d13680c2d1cf 100644 --- a/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java @@ -1,10 +1,10 @@ package io.playground; -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("/hello") public class HelloResource { @@ -17,4 +17,4 @@ public class HelloResource { public String hello() { return "hello " + myData.getMessage(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java b/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java index ed89e60c1720a..2832664cd9b62 100644 --- a/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java +++ b/integration-tests/gradle/src/main/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java @@ -1,7 +1,7 @@ package io.playground; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; @Singleton public class MyDataProducer { diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java index df2c4cb2cc3ad..c712bf9fa6b4f 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/Product.java @@ -1,9 +1,9 @@ package org.acme.gradle.multi.dao; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQuery; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "Product.findAll", query = "SELECT p FROM Product p ORDER BY p.name") diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java index 11e56c22ded60..b01ccaea1d9bc 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-dao/src/main/java/org/acme/gradle/multi/dao/ProductService.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; @ApplicationScoped public class ProductService { diff --git a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/src/main/java/org/acme/gradle/multi/rest/ProductResource.java b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/src/main/java/org/acme/gradle/multi/rest/ProductResource.java index 46e6bfa31d142..25880ed3cba05 100644 --- a/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/src/main/java/org/acme/gradle/multi/rest/ProductResource.java +++ b/integration-tests/gradle/src/main/resources/composite-project-with-dependencies/gradle-rest/src/main/java/org/acme/gradle/multi/rest/ProductResource.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.acme.gradle.multi.dao.Product; import org.acme.gradle.multi.dao.ProductService; @@ -22,4 +22,4 @@ public class ProductResource { public List list() { return productService.getProducts(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts index 065ace8968752..bb69c02f58958 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts @@ -38,8 +38,8 @@ java { } allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/AdminResource.kt b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/AdminResource.kt index 735dc2f9b7f75..7ed836b71ea97 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/AdminResource.kt +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/AdminResource.kt @@ -1,9 +1,9 @@ package org.acme import org.acme.api.AdminAPI -import javax.enterprise.context.ApplicationScoped -import javax.ws.rs.core.Response -import javax.ws.rs.core.UriInfo +import jakarta.enterprise.context.ApplicationScoped +import jakarta.ws.rs.core.Response +import jakarta.ws.rs.core.UriInfo @ApplicationScoped diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/api/API.kt b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/api/API.kt index 65df7a54c03d2..cc34c773b8738 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/api/API.kt +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/src/main/kotlin/org/acme/api/API.kt @@ -1,10 +1,10 @@ package org.acme.api -import javax.validation.Valid -import javax.ws.rs.* -import javax.ws.rs.core.Context -import javax.ws.rs.core.Response -import javax.ws.rs.core.UriInfo +import jakarta.validation.Valid +import jakarta.ws.rs.* +import jakarta.ws.rs.core.Context +import jakarta.ws.rs.core.Response +import jakarta.ws.rs.core.UriInfo @Path(value = "/admin/api/v1.0") @Produces(value = ["application/json"]) diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/src/main/java/org/acme/HelloResource.java index cdfa5a40b1f83..9b81f9385f088 100644 --- a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-exclude/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/src/main/java/org/acme/HelloResource.java index cdfa5a40b1f83..9b81f9385f088 100644 --- a/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/conditional-test-project/runner-with-explicit-import/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/main/resources/conditional-test-project/runner/src/main/java/org/acme/HelloResource.java index cdfa5a40b1f83..9b81f9385f088 100644 --- a/integration-tests/gradle/src/main/resources/conditional-test-project/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/conditional-test-project/runner/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/src/main/java/org/acme/HelloResource.java index cdfa5a40b1f83..9b81f9385f088 100644 --- a/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/conditional-test-project/scenario-two/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/configuration-inheritance-project/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/configuration-inheritance-project/src/main/java/org/acme/quarkus/sample/HelloResource.java index e3d045c22fe83..645014ecc74cd 100644 --- a/integration-tests/gradle/src/main/resources/configuration-inheritance-project/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/configuration-inheritance-project/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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("/hello") public class HelloResource { @@ -14,4 +14,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/custom-config-java-module/src/main/java/org/acme/WorkingDirResource.java b/integration-tests/gradle/src/main/resources/custom-config-java-module/src/main/java/org/acme/WorkingDirResource.java index 4d4c2b7f18e88..95dd884a91613 100644 --- a/integration-tests/gradle/src/main/resources/custom-config-java-module/src/main/java/org/acme/WorkingDirResource.java +++ b/integration-tests/gradle/src/main/resources/custom-config-java-module/src/main/java/org/acme/WorkingDirResource.java @@ -1,9 +1,9 @@ package org.acme; -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("/working-dir") public class WorkingDirResource { @@ -13,4 +13,4 @@ public class WorkingDirResource { public String hello() { return java.nio.file.Paths.get(".").toAbsolutePath().toString(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/custom-filesystem-provider/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/custom-filesystem-provider/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index ca1cb06998ba3..a7fce2a4ffbe9 100644 --- a/integration-tests/gradle/src/main/resources/custom-filesystem-provider/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/custom-filesystem-provider/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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("/hello") @@ -15,4 +15,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/custom-filesystem-provider/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/custom-filesystem-provider/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/custom-filesystem-provider/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/custom-filesystem-provider/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java index 89804c62b5e24..fbb27b57b28fc 100644 --- a/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { @@ -13,4 +13,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/custom-working-dir-app/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/custom-working-dir-app/src/main/java/org/acme/quarkus/sample/HelloResource.java index 683bcd110f6e9..5e3963793b04a 100644 --- a/integration-tests/gradle/src/main/resources/custom-working-dir-app/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/custom-working-dir-app/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,9 +1,9 @@ package org.acme.quarkus.sample; -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.config.inject.ConfigProperty; @@ -18,4 +18,4 @@ public class HelloResource { public String hello() { return message; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/dependency-constraints-project/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/dependency-constraints-project/src/main/java/org/acme/quarkus/sample/HelloResource.java index e3d045c22fe83..645014ecc74cd 100644 --- a/integration-tests/gradle/src/main/resources/dependency-constraints-project/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/dependency-constraints-project/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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("/hello") public class HelloResource { @@ -14,4 +14,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/dotenv-config-java-module/src/main/java/org/acme/GreetingResource.java b/integration-tests/gradle/src/main/resources/dotenv-config-java-module/src/main/java/org/acme/GreetingResource.java index 6ac027d26dc65..f5340c3b81447 100644 --- a/integration-tests/gradle/src/main/resources/dotenv-config-java-module/src/main/java/org/acme/GreetingResource.java +++ b/integration-tests/gradle/src/main/resources/dotenv-config-java-module/src/main/java/org/acme/GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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.config.inject.ConfigProperty; diff --git a/integration-tests/gradle/src/main/resources/extensions/simple-extension/runtime/src/main/java/org/acme/extension/MyExtensionServlet.java b/integration-tests/gradle/src/main/resources/extensions/simple-extension/runtime/src/main/java/org/acme/extension/MyExtensionServlet.java index 9938bb037f255..523a6f0d91222 100644 --- a/integration-tests/gradle/src/main/resources/extensions/simple-extension/runtime/src/main/java/org/acme/extension/MyExtensionServlet.java +++ b/integration-tests/gradle/src/main/resources/extensions/simple-extension/runtime/src/main/java/org/acme/extension/MyExtensionServlet.java @@ -1,9 +1,9 @@ package org.acme.extension; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @WebServlet diff --git a/integration-tests/gradle/src/main/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java index 140a8a6b9d6f0..e5c864ff6be0e 100644 --- a/integration-tests/gradle/src/main/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.HelloMsg; @@ -18,4 +18,4 @@ public String hello() { // return a thing from proto file (for devmode test) return "hello " + number; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/grpc-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/grpc-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 9f2ed900a48d8..ef4ad4d067d2e 100644 --- a/integration-tests/gradle/src/main/resources/grpc-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/grpc-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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 devmodetest.v1.Devmodetest; @@ -23,4 +23,4 @@ public String hello() { // return a thing from proto file (for devmode test) return "hello " + number; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/grpc-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/grpc-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/grpc-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/grpc-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 092d251dc1ebb..1d723a4410ac0 100644 --- a/integration-tests/gradle/src/main/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.common.CommonBean; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + common.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/main/java/org/acme/ExampleResource.java index 02f4f004570f4..1831319034d72 100644 --- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/test/java/org/acme/ExampleResourceTest.java index 0da2d3773c53b..9e48573de4616 100644 --- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/test/java/org/acme/ExampleResourceTest.java +++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/application/src/test/java/org/acme/ExampleResourceTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.common.QuarkusTestResource; @@ -28,4 +28,4 @@ public void testHelloEndpoint() { assertEquals("test", libraryBean.getValue()); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/main/java/org/acme/LibraryBean.java b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/main/java/org/acme/LibraryBean.java index c91d351a56f0d..4db74274e4a1b 100644 --- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/main/java/org/acme/LibraryBean.java +++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/main/java/org/acme/LibraryBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LibraryBean implements LibraryBeanInterface { diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestBean.java b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestBean.java index 7bed6eaeac600..86cd576b9e696 100644 --- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestBean.java +++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestBean.java @@ -1,7 +1,7 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class LibraryTestBean implements LibraryBeanInterface { diff --git a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestDepBean.java b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestDepBean.java index 25aee2b5dd033..45dc1eeff1c3d 100644 --- a/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestDepBean.java +++ b/integration-tests/gradle/src/main/resources/inject-bean-from-test-config/library/src/test/java/org/acme/LibraryTestDepBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LibraryTestDepBean { diff --git a/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/src/main/java/org/acme/ExampleResource.java index d01ef472250e2..6c5d17ce93457 100644 --- a/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/inject-quarkus-app-properties/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -21,4 +21,4 @@ public class ExampleResource { public String hello() { return appName + " " + appVersion; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/it-test-basic-project/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/it-test-basic-project/src/main/java/org/acme/ExampleResource.java index dfb8c96404500..e57af7ebdd1f8 100644 --- a/integration-tests/gradle/src/main/resources/it-test-basic-project/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/it-test-basic-project/src/main/java/org/acme/ExampleResource.java @@ -1,9 +1,9 @@ package org.acme; -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 ExampleResource { @@ -14,4 +14,4 @@ public class ExampleResource { public String hello() { return "Hello World"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 092d251dc1ebb..1d723a4410ac0 100644 --- a/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.common.CommonBean; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + common.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle index cd1ce8f44ed0d..cba597a34e794 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle @@ -29,8 +29,8 @@ group 'org.acme' version '1.0.0-SNAPSHOT' allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt index 00c3c4f2a15c0..e1ee93710f419 100644 --- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt +++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt @@ -1,9 +1,9 @@ package org.acme -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.example.HelloMsg diff --git a/integration-tests/gradle/src/main/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java index d01ef472250e2..6c5d17ce93457 100644 --- a/integration-tests/gradle/src/main/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -21,4 +21,4 @@ public class ExampleResource { public String hello() { return appName + " " + appVersion; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java index 4a05673847be1..1a06a08fd6898 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java @@ -2,11 +2,11 @@ import org.acme.lib.LibService; -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("/hello") public class ExampleResource { @@ -19,4 +19,4 @@ public class ExampleResource { public String hello() { return "foo " + libService.bar(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java b/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java index 5f872ecd6a32f..c1713c632ef0a 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java +++ b/integration-tests/gradle/src/main/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java @@ -1,6 +1,6 @@ package org.acme.lib; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class LibService { diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle index 709e93ba9f217..41271ff4b8d01 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/build.gradle @@ -11,8 +11,8 @@ dependencies { } allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/domain/src/main/kotlin/com/example/quarkusmm/domain/CustomerServiceImpl.kt b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/domain/src/main/kotlin/com/example/quarkusmm/domain/CustomerServiceImpl.kt index 5e83e3344a77b..bc4e3777ec75a 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/domain/src/main/kotlin/com/example/quarkusmm/domain/CustomerServiceImpl.kt +++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/domain/src/main/kotlin/com/example/quarkusmm/domain/CustomerServiceImpl.kt @@ -1,7 +1,7 @@ package com.example.quarkusmm.domain import com.example.quarkusmm.port.CustomerService -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class CustomerServiceImpl : CustomerService { diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/src/main/kotlin/com/example/quarkusmm/ExampleResource.kt b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/src/main/kotlin/com/example/quarkusmm/ExampleResource.kt index db7ae49bbeaab..2ab9c5ffff058 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/src/main/kotlin/com/example/quarkusmm/ExampleResource.kt +++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/src/main/kotlin/com/example/quarkusmm/ExampleResource.kt @@ -1,11 +1,11 @@ package com.example.quarkusmm import com.example.quarkusmm.port.CustomerService -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("/hello") class ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/multi-module-named-injection/common/src/main/java/org/acme/common/health/HealthStatusProducer.java b/integration-tests/gradle/src/main/resources/multi-module-named-injection/common/src/main/java/org/acme/common/health/HealthStatusProducer.java index a1b9db0155ba8..ec36454b9203c 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-named-injection/common/src/main/java/org/acme/common/health/HealthStatusProducer.java +++ b/integration-tests/gradle/src/main/resources/multi-module-named-injection/common/src/main/java/org/acme/common/health/HealthStatusProducer.java @@ -1,8 +1,8 @@ package org.acme.common.health; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; @ApplicationScoped public class HealthStatusProducer { diff --git a/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/ExampleResource.java b/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/ExampleResource.java index 302703b7559a1..a34bd3ae98b67 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme.app; -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("/hello") public class ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service1.java b/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service1.java index 04720a883bb90..b4137b1a72a07 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service1.java +++ b/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service1.java @@ -3,9 +3,9 @@ import org.acme.common.health.HealthStatus; import org.acme.common.health.HealthStatusProducer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; @ApplicationScoped public class Service1 { diff --git a/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service2.java b/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service2.java index b4aed632d56dc..ba06039d069b4 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service2.java +++ b/integration-tests/gradle/src/main/resources/multi-module-named-injection/quarkus/src/main/java/org/acme/app/Service2.java @@ -3,9 +3,9 @@ import org.acme.common.health.HealthStatus; import org.acme.common.health.HealthStatusProducer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; @ApplicationScoped public class Service2 { diff --git a/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/src/main/java/io/quarkus/reproducer/ExampleResource.java b/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/src/main/java/io/quarkus/reproducer/ExampleResource.java index 4886d12bc53a1..8c399680dd69b 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/src/main/java/io/quarkus/reproducer/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/multi-module-parent-dependency/app/src/main/java/io/quarkus/reproducer/ExampleResource.java @@ -1,9 +1,9 @@ package io.quarkus.reproducer; -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 ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/modB/src/main/java/org/acme/GreetingResource.java b/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/modB/src/main/java/org/acme/GreetingResource.java index 979ba0554baaa..e5f5b6ca5694b 100644 --- a/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/modB/src/main/java/org/acme/GreetingResource.java +++ b/integration-tests/gradle/src/main/resources/multi-module-with-empty-module/modB/src/main/java/org/acme/GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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 GreetingResource { @@ -13,4 +13,4 @@ public class GreetingResource { public String hello() { return "foo bar"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle index 194197f15b314..913eeee87ee60 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle +++ b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle @@ -28,8 +28,8 @@ group 'org.acme' version '1.0.0-SNAPSHOT' allOpen { - annotation("javax.ws.rs.Path") - annotation("javax.enterprise.context.ApplicationScoped") + annotation("jakarta.ws.rs.Path") + annotation("jakarta.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java b/integration-tests/gradle/src/main/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java index 433b9aeb179ec..b8df650a668c1 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java +++ b/integration-tests/gradle/src/main/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SimpleService { diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt b/integration-tests/gradle/src/main/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt index c488bc2a37e42..6521244b6a46a 100644 --- a/integration-tests/gradle/src/main/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt +++ b/integration-tests/gradle/src/main/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt @@ -1,10 +1,10 @@ package org.acme -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.acme.service.SimpleService diff --git a/integration-tests/gradle/src/main/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java index 2193180639cb9..cdc31a7b81860 100644 --- a/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java @@ -1,9 +1,9 @@ package org.acme; -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 ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java b/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java index c8740c90b3d9d..b01c6ddb2d4d7 100644 --- a/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java +++ b/integration-tests/gradle/src/main/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java @@ -1,13 +1,13 @@ package org.acme; -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.hibernate.orm.panache.PanacheEntity; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Project extends PanacheEntity { diff --git a/integration-tests/gradle/src/main/resources/spring-dependency-plugin-project/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/spring-dependency-plugin-project/src/main/java/org/acme/ExampleResource.java index 68cdb11d9e67d..413f41422ff5d 100644 --- a/integration-tests/gradle/src/main/resources/spring-dependency-plugin-project/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/spring-dependency-plugin-project/src/main/java/org/acme/ExampleResource.java @@ -1,9 +1,9 @@ package org.acme; -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 ExampleResource { diff --git a/integration-tests/gradle/src/main/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java b/integration-tests/gradle/src/main/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java index acdf0d34ab5bb..7c2bd7fa9fccf 100644 --- a/integration-tests/gradle/src/main/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java +++ b/integration-tests/gradle/src/main/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java @@ -1,9 +1,9 @@ package org.my.group; -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 MyResource { @@ -13,4 +13,4 @@ public class MyResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index e3d045c22fe83..645014ecc74cd 100644 --- a/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/test-resources-in-build-steps/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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("/hello") public class HelloResource { @@ -14,4 +14,4 @@ public class HelloResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/ExampleResource.java index 65b2e2dedb582..35f468a85b354 100644 --- a/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class ExampleResource { @@ -17,4 +17,4 @@ public class ExampleResource { public String hello() { return config.message; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/TestOnlyResource.java b/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/TestOnlyResource.java index f6a5b6aeabba9..228eb76086464 100644 --- a/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/TestOnlyResource.java +++ b/integration-tests/gradle/src/main/resources/test-resources-vs-main-resources/src/main/java/org/acme/TestOnlyResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -19,4 +19,4 @@ public class TestOnlyResource { public String hello() { return testOnly; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/test-that-fast-jar-format-works/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/test-that-fast-jar-format-works/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/test-that-fast-jar-format-works/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/test-that-fast-jar-format-works/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/test-uber-jar-format-works/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/main/resources/test-uber-jar-format-works/src/main/java/org/acme/ExampleResource.java index 2cd1720641843..5003ae0339598 100644 --- a/integration-tests/gradle/src/main/resources/test-uber-jar-format-works/src/main/java/org/acme/ExampleResource.java +++ b/integration-tests/gradle/src/main/resources/test-uber-jar-format-works/src/main/java/org/acme/ExampleResource.java @@ -1,10 +1,10 @@ package org.acme; -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.inject.ConfigProperty; @@ -16,4 +16,4 @@ public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java index 092d251dc1ebb..1d723a4410ac0 100644 --- a/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.common.CommonBean; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "hello " + common.getName(); } -} \ No newline at end of file +} diff --git a/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java index ace88a5b0e415..d7b2f0a5501eb 100644 --- a/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java +++ b/integration-tests/gradle/src/main/resources/uber-jar-for-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java @@ -1,6 +1,6 @@ package org.acme.common; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class CommonBean { diff --git a/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java b/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java index e3978a085556b..597e5f4ef8d43 100644 --- a/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java +++ b/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java @@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.hamcrest.Matchers; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ContextChecker.java b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ContextChecker.java index 3ab8366bd47b0..979506cdff658 100644 --- a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ContextChecker.java +++ b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ContextChecker.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ContextChecker { diff --git a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/Item.java b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/Item.java index 667250ca300cc..17e4e1d50558f 100644 --- a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/Item.java +++ b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/Item.java @@ -1,6 +1,6 @@ package com.example.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ReactiveService.java b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ReactiveService.java index 99a786917ac14..4ef14e229842d 100644 --- a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ReactiveService.java +++ b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/ReactiveService.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/RequestScopeBean.java b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/RequestScopeBean.java index 7391f27d9bac9..7fbce3e2b48f0 100644 --- a/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/RequestScopeBean.java +++ b/integration-tests/grpc-hibernate-reactive/src/main/java/com/example/reactive/RequestScopeBean.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; import io.smallrye.common.vertx.ContextLocals; diff --git a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ContextChecker.java b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ContextChecker.java index 44f4e121e7124..23f083071e29b 100644 --- a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ContextChecker.java +++ b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ContextChecker.java @@ -3,8 +3,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ContextChecker { diff --git a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/Item.java b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/Item.java index 3c8d49b654313..ff2e1faf76461 100644 --- a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/Item.java +++ b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/Item.java @@ -1,8 +1,8 @@ package com.example.grpc.hibernate; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity(name = "Item") public class Item { @@ -19,4 +19,4 @@ public String toString() { ", text='" + text + '\'' + '}'; } -} \ No newline at end of file +} diff --git a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ItemDao.java b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ItemDao.java index c3b63700cd91d..db4dcf9717099 100644 --- a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ItemDao.java +++ b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/ItemDao.java @@ -1,9 +1,9 @@ package com.example.grpc.hibernate; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; @ApplicationScoped public class ItemDao { diff --git a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RawTestService.java b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RawTestService.java index 406675b93728d..35f7e26fe8cca 100644 --- a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RawTestService.java +++ b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RawTestService.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logging.Logger; diff --git a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RequestScopeBean.java b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RequestScopeBean.java index 7666a7868d7d6..67343bb53fc71 100644 --- a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RequestScopeBean.java +++ b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/RequestScopeBean.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestScopeBean { diff --git a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/TestService.java b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/TestService.java index b765f59a2ec69..9fbb71473c879 100644 --- a/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/TestService.java +++ b/integration-tests/grpc-hibernate/src/main/java/com/example/grpc/hibernate/TestService.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import org.jboss.logging.Logger; diff --git a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderClientInterceptor.java b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderClientInterceptor.java index abf1d9e231120..c6dcea58ef74f 100644 --- a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderClientInterceptor.java +++ b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderClientInterceptor.java @@ -2,7 +2,7 @@ import java.util.logging.Logger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderServerInterceptor.java b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderServerInterceptor.java index e04db0ea0e080..82bb2ed772852 100644 --- a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderServerInterceptor.java +++ b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HeaderServerInterceptor.java @@ -2,7 +2,7 @@ import java.util.logging.Logger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.google.common.annotations.VisibleForTesting; diff --git a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloExceptionHandlerProvider.java b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloExceptionHandlerProvider.java index 29728b52e5d95..ab7d87e42788c 100644 --- a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloExceptionHandlerProvider.java +++ b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloExceptionHandlerProvider.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.interceptors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloWorldEndpoint.java b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloWorldEndpoint.java index f29b8f2530552..45a7e12e70ca3 100644 --- a/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloWorldEndpoint.java +++ b/integration-tests/grpc-interceptors/src/main/java/io/quarkus/grpc/examples/interceptors/HelloWorldEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.grpc.examples.interceptors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.core.Response; import examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-interceptors/src/test/java/io/quarkus/grpc/example/interceptors/HelloWorldServiceVertxTest.java b/integration-tests/grpc-interceptors/src/test/java/io/quarkus/grpc/example/interceptors/HelloWorldServiceVertxTest.java index 5d7ff3402ae5a..7665e277b2412 100644 --- a/integration-tests/grpc-interceptors/src/test/java/io/quarkus/grpc/example/interceptors/HelloWorldServiceVertxTest.java +++ b/integration-tests/grpc-interceptors/src/test/java/io/quarkus/grpc/example/interceptors/HelloWorldServiceVertxTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.example.interceptors; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.VertxGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/grpc-mutual-auth/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java b/integration-tests/grpc-mutual-auth/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java index 7db3cfbd4b4d5..34a6038954b0a 100644 --- a/integration-tests/grpc-mutual-auth/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java +++ b/integration-tests/grpc-mutual-auth/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.grpc.examples.hello; -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 examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsEndpointTest.java b/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsEndpointTest.java index a390b602c10cd..2bdd006abdedc 100644 --- a/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsEndpointTest.java +++ b/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsEndpointTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Disabled; diff --git a/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsServiceTest.java b/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsServiceTest.java index f211a3aa3c8ed..6ad308b2db07b 100644 --- a/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsServiceTest.java +++ b/integration-tests/grpc-mutual-auth/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldMutualTlsServiceTest.java @@ -2,7 +2,7 @@ import java.io.InputStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java index 2cc764be04501..2af85b4c0b612 100644 --- a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java +++ b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.grpc.CallOptions; import io.grpc.Channel; diff --git a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java index f20b1db3e23a3..42ef2d5d38c19 100644 --- a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java +++ b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java @@ -1,10 +1,10 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java index f614b842e8ab9..119965b40ef24 100644 --- a/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java +++ b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.VertxGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java b/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java index c7d566b4a2807..ee57fe8db2b80 100644 --- a/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java +++ b/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java @@ -6,14 +6,14 @@ import java.util.Map; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -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.DELETE; +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 examples.Greeter; import examples.GreeterGrpc; diff --git a/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/IncomingInterceptor.java b/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/IncomingInterceptor.java index 6b7f5a626250e..83a235ef080f5 100644 --- a/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/IncomingInterceptor.java +++ b/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/IncomingInterceptor.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.grpc.Metadata; import io.grpc.ServerCall; diff --git a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/GrpcMockTest.java b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/GrpcMockTest.java index 266af61ab131c..468d7fe59d995 100644 --- a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/GrpcMockTest.java +++ b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/GrpcMockTest.java @@ -1,7 +1,7 @@ package io.quarkus.grpc.examples.hello; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java index f3c2e9df7ffd8..38d88beabaf97 100644 --- a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java +++ b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Disabled; diff --git a/integration-tests/grpc-proto-v2/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java b/integration-tests/grpc-proto-v2/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java index 1e077c7dcf71e..4922f5e81e09e 100644 --- a/integration-tests/grpc-proto-v2/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java +++ b/integration-tests/grpc-proto-v2/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.grpc.examples.hello; -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 examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-proto-v2/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java b/integration-tests/grpc-proto-v2/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java index f614b842e8ab9..119965b40ef24 100644 --- a/integration-tests/grpc-proto-v2/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java +++ b/integration-tests/grpc-proto-v2/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.VertxGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcCallingResource.java b/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcCallingResource.java index ed8a889460830..6e342afcdaa13 100644 --- a/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcCallingResource.java +++ b/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcCallingResource.java @@ -1,9 +1,9 @@ package io.quarkus.grpc.examples.hello; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import examples.Greeter; import examples.HelloReply; diff --git a/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcServices.java b/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcServices.java index 199ed1dade05d..5ecab65a7fac5 100644 --- a/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcServices.java +++ b/integration-tests/grpc-stork-response-time/src/main/java/io/quarkus/grpc/examples/hello/GrpcServices.java @@ -6,9 +6,9 @@ import java.util.concurrent.ExecutionException; import java.util.function.Supplier; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java b/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java index 5c8e496e28a58..5b2bcc52e2850 100644 --- a/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java +++ b/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java @@ -1,10 +1,10 @@ package io.quarkus.grpc.example.streaming; -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.grpc.examples.streaming.Empty; import io.grpc.examples.streaming.Item; diff --git a/integration-tests/grpc-streaming/src/test/java/io/quarkus/grpc/example/streaming/VertxStreamingServiceTest.java b/integration-tests/grpc-streaming/src/test/java/io/quarkus/grpc/example/streaming/VertxStreamingServiceTest.java index 5b708c3cc6770..2f49c34e01639 100644 --- a/integration-tests/grpc-streaming/src/test/java/io/quarkus/grpc/example/streaming/VertxStreamingServiceTest.java +++ b/integration-tests/grpc-streaming/src/test/java/io/quarkus/grpc/example/streaming/VertxStreamingServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.example.streaming; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.VertxGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/grpc-tls/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java b/integration-tests/grpc-tls/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java index 7db3cfbd4b4d5..34a6038954b0a 100644 --- a/integration-tests/grpc-tls/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java +++ b/integration-tests/grpc-tls/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldTlsEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.grpc.examples.hello; -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 examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-tls/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldTlsServiceTest.java b/integration-tests/grpc-tls/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldTlsServiceTest.java index 7ed76c01788a5..695568a38d678 100644 --- a/integration-tests/grpc-tls/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldTlsServiceTest.java +++ b/integration-tests/grpc-tls/src/test/java/io/quarkus/grpc/examples/hello/VertxHelloWorldTlsServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.VertxGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/grpc-vertx/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldNewEndpoint.java b/integration-tests/grpc-vertx/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldNewEndpoint.java index e8babc54aa55b..e7bc4959a9caa 100644 --- a/integration-tests/grpc-vertx/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldNewEndpoint.java +++ b/integration-tests/grpc-vertx/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldNewEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.grpc.examples.hello; -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 examples.GreeterGrpc; import examples.HelloReply; diff --git a/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldN2OServiceTest.java b/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldN2OServiceTest.java index 3926f8ef9ac38..a168b8da36a6d 100644 --- a/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldN2OServiceTest.java +++ b/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldN2OServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.N2OGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldVertxServiceTest.java b/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldVertxServiceTest.java index 26fbf94b45ad2..cc4f2e51b59b6 100644 --- a/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldVertxServiceTest.java +++ b/integration-tests/grpc-vertx/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldVertxServiceTest.java @@ -1,6 +1,6 @@ package io.quarkus.grpc.examples.hello; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.grpc.test.utils.VertxGRPCTestProfile; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/Project.java b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/Project.java index 023933ad3f1d3..748a32c716cdb 100644 --- a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/Project.java +++ b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/Project.java @@ -1,11 +1,11 @@ package io.quarkus.it.envers; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.envers.Audited; diff --git a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectApplication.java b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectApplication.java index 406706633bb3b..5bea27e317d82 100644 --- a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectApplication.java +++ b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectApplication.java @@ -1,7 +1,7 @@ package io.quarkus.it.envers; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/jpa-envers-test") public class ProjectApplication extends Application { diff --git a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java index 5d1550e89e09e..2a34092009b25 100644 --- a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java +++ b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java @@ -1,14 +1,14 @@ package io.quarkus.it.envers; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.EntityManager; -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.MediaType; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +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.MediaType; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java index 952f7062fd7c5..0e8ce19a4ada3 100644 --- a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java @@ -2,7 +2,7 @@ import java.time.LocalDate; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java index 1a636496400c1..0445ecfc9d64f 100644 --- a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java @@ -1,10 +1,10 @@ package io.quarkus.it.hibertnate.orm.graphql.panache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotBlank; @Entity public class Book { diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java index 35052b9b0976a..f4b7863253249 100644 --- a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibertnate.orm.graphql.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java index a3e8b1d1a1e31..56533d5641c50 100644 --- a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java +++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.Description; import org.eclipse.microprofile.graphql.GraphQLApi; diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java index 47682edf351ac..0dd50058291b0 100644 --- a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java +++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibertnate.orm.graphql.panache; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; public class PayloadCreator { diff --git a/integration-tests/hibernate-orm-panache-kotlin/pom.xml b/integration-tests/hibernate-orm-panache-kotlin/pom.xml index 4b604856a3010..bbffc72296c1f 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/pom.xml +++ b/integration-tests/hibernate-orm-panache-kotlin/pom.xml @@ -224,7 +224,7 @@ all-open - + diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt index b7b122564d0d3..28f558cf07bf7 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.kotlin -import javax.persistence.Entity -import javax.persistence.Transient +import jakarta.persistence.Entity +import jakarta.persistence.Transient @Entity open class AccessorEntity : GenericEntity() { diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt index 15f7b66eca9c7..7122d2951e013 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt @@ -2,9 +2,9 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanionBase import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntityBase -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id @Entity open class Address : PanacheEntityBase { diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AddressDao.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AddressDao.kt index f10ac5da7b6e5..af5e4bf2ec608 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AddressDao.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AddressDao.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepositoryBase -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class AddressDao(private val dummyService: DummyService) : PanacheRepositoryBase { diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5274EntityRepository.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5274EntityRepository.kt index 9d0ea8e8a5a38..6be41ebf47e6a 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5274EntityRepository.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5274EntityRepository.kt @@ -1,6 +1,6 @@ package io.quarkus.it.panache.kotlin -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class Bug5274EntityRepository : AbstractRepository() diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5885EntityRepository.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5885EntityRepository.kt index 84dfb0cae5a35..577b9c5ebc37e 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5885EntityRepository.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Bug5885EntityRepository.kt @@ -1,6 +1,6 @@ package io.quarkus.it.panache.kotlin -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class Bug5885EntityRepository : Bug5885AbstractRepository() diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt index 6f2f6a5770eb2..da3aaefd70bc7 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt @@ -3,10 +3,10 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntityBase -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id -import javax.persistence.ManyToOne +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne @Entity open class Dog() : PanacheEntityBase { diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DogDao.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DogDao.kt index 670e5153bfce0..c0b6d134b1ddb 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DogDao.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DogDao.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepositoryBase -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class DogDao : PanacheRepositoryBase diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DummyService.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DummyService.kt index 40b0146b30502..7a6bb427be791 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DummyService.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/DummyService.kt @@ -1,6 +1,6 @@ package io.quarkus.it.panache.kotlin -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped // used only to validate that we can inject CDI beans into Panache repositories written in Kotlin @ApplicationScoped diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/GenericEntity.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/GenericEntity.kt index 54cc789609506..e37791bf53237 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/GenericEntity.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/GenericEntity.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.MappedSuperclass +import jakarta.persistence.MappedSuperclass @MappedSuperclass abstract class GenericEntity : PanacheEntity() { diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/JAXBEntity.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/JAXBEntity.kt index a606084a010ea..23ef8c39ca239 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/JAXBEntity.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/JAXBEntity.kt @@ -1,14 +1,14 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.Entity -import javax.xml.bind.annotation.XmlAccessType -import javax.xml.bind.annotation.XmlAccessorType -import javax.xml.bind.annotation.XmlAttribute -import javax.xml.bind.annotation.XmlElement -import javax.xml.bind.annotation.XmlElements -import javax.xml.bind.annotation.XmlRootElement -import javax.xml.bind.annotation.XmlTransient +import jakarta.persistence.Entity +import jakarta.xml.bind.annotation.XmlAccessType +import jakarta.xml.bind.annotation.XmlAccessorType +import jakarta.xml.bind.annotation.XmlAttribute +import jakarta.xml.bind.annotation.XmlElement +import jakarta.xml.bind.annotation.XmlElements +import jakarta.xml.bind.annotation.XmlRootElement +import jakarta.xml.bind.annotation.XmlTransient @Entity @XmlRootElement(name = "JAXBEntity") diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt index 5b65534854af8..69357581a3113 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt @@ -2,22 +2,22 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity +import jakarta.persistence.CascadeType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EnumType +import jakarta.persistence.Enumerated +import jakarta.persistence.FetchType +import jakarta.persistence.ManyToOne +import jakarta.persistence.OneToMany +import jakarta.persistence.Transient +import jakarta.xml.bind.annotation.XmlRootElement +import jakarta.xml.bind.annotation.XmlTransient import org.hibernate.annotations.Filter import org.hibernate.annotations.FilterDef import org.hibernate.annotations.FilterDefs import org.hibernate.annotations.Filters import org.hibernate.annotations.ParamDef -import javax.persistence.CascadeType -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EnumType -import javax.persistence.Enumerated -import javax.persistence.FetchType -import javax.persistence.ManyToOne -import javax.persistence.OneToMany -import javax.persistence.Transient -import javax.xml.bind.annotation.XmlRootElement -import javax.xml.bind.annotation.XmlTransient @XmlRootElement @Entity(name = "Person2") diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt index d3f7250972b08..240b0a1cf298d 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt @@ -2,7 +2,7 @@ package io.quarkus.it.panache.kotlin import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.Companion.INSTANCE -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class PersonRepository : PanacheRepository { diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt index e97f685a1624f..fa1bb50df7c41 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt @@ -5,6 +5,19 @@ import io.quarkus.panache.common.Page import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort import io.quarkus.panache.common.exception.PanacheQueryException +import jakarta.inject.Inject +import jakarta.persistence.LockModeType +import jakarta.persistence.NoResultException +import jakarta.persistence.NonUniqueResultException +import jakarta.persistence.PersistenceException +import jakarta.transaction.Transactional +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType +import jakarta.xml.bind.annotation.XmlAttribute +import jakarta.xml.bind.annotation.XmlElements +import jakarta.xml.bind.annotation.XmlTransient import org.hibernate.engine.spi.SelfDirtinessTracker import org.hibernate.jpa.QueryHints import org.junit.jupiter.api.Assertions @@ -15,19 +28,6 @@ import java.lang.reflect.Method import java.util.UUID import java.util.stream.Collectors import java.util.stream.Stream -import javax.inject.Inject -import javax.persistence.LockModeType -import javax.persistence.NoResultException -import javax.persistence.NonUniqueResultException -import javax.persistence.PersistenceException -import javax.transaction.Transactional -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.Produces -import javax.ws.rs.core.MediaType -import javax.xml.bind.annotation.XmlAttribute -import javax.xml.bind.annotation.XmlElements -import javax.xml.bind.annotation.XmlTransient /** * Various tests covering Panache functionality. All tests should work in both standard JVM and in native mode. diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/KotlinPanacheFunctionalityWithInjectTest.kt b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/KotlinPanacheFunctionalityWithInjectTest.kt index bc3585da41c43..98b80d2f2bbd1 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/KotlinPanacheFunctionalityWithInjectTest.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/KotlinPanacheFunctionalityWithInjectTest.kt @@ -3,10 +3,10 @@ package io.quarkus.it.panache import io.quarkus.it.panache.kotlin.Person import io.quarkus.it.panache.kotlin.PersonRepository import io.quarkus.test.junit.QuarkusTest +import jakarta.inject.Inject +import jakarta.transaction.Transactional import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.transaction.Transactional /** * Test Panache operations running in Quarkus using injected resources diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/MockPersonRepository.kt b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/MockPersonRepository.kt index 8c5cdc87db08e..0dd0d8a2b093b 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/MockPersonRepository.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/MockPersonRepository.kt @@ -1,9 +1,9 @@ package io.quarkus.it.panache import io.quarkus.it.panache.kotlin.PersonRepository -import javax.annotation.Priority -import javax.enterprise.context.ApplicationScoped -import javax.enterprise.inject.Alternative +import jakarta.annotation.Priority +import jakarta.enterprise.context.ApplicationScoped +import jakarta.enterprise.inject.Alternative /** * An alternate implementation of [PersonRepository] to demonstrate that Repository entity type can be retrieved diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt index 99268af2ed28b..268f2672279dd 100644 --- a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt +++ b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt @@ -5,13 +5,13 @@ import io.quarkus.it.panache.kotlin.AddressDao import io.quarkus.it.panache.kotlin.Person import io.quarkus.it.panache.kotlin.TestEndpoint import io.quarkus.test.junit.QuarkusTest +import jakarta.inject.Inject +import jakarta.persistence.EntityManager import org.hibernate.internal.SessionImpl import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.fail import java.sql.ResultSet -import javax.inject.Inject -import javax.persistence.EntityManager @QuarkusTest class TestEndpointRunner { diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java index b7d1063750b51..5925ada96e057 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; @Entity public class AccessorEntity extends GenericEntity { diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java index e8467494e0b3c..9e4a0552d81cd 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java index c39dabb1a9c4b..748552b781735 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java index 52cbe612ffa52..873ee9aadd6b3 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.transaction.Transactional; +import jakarta.persistence.Entity; +import jakarta.transaction.Transactional; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java index 973e1d20f8b60..a816a582c8f60 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java index 0553d9c403e21..a66e82f4cb062 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java @@ -1,8 +1,8 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java index 7c237ec801610..5cd8f6131e2ab 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java index 19a55a5610c4d..e45eb251156d7 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Bug5274EntityRepository extends AbstractRepository { diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java index be9d686c6adc0..3f16aa62a542c 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Bug5885EntityRepository extends Bug5885AbstractRepository { diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java index 2bd82fb8b591c..6f3bd9a4afb48 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class Bug7721Entity extends Bug7721EntitySuperClass { diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java index b4ab46b217486..cdfdab400efbd 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java index cf97f39581843..a63df847ce753 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java index 312e0fbaccdcc..1c1021d3fc30d 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java index be528ff381c54..1b2c50222b6b8 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java index 6962f0d4d908a..f517180e048fd 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java @@ -1,9 +1,9 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java index 77ebcc97be3a1..073a6e9832d4c 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java index 029da0506d444..86383e2e56464 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import io.quarkus.panache.common.Parameters; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java index d3bf3aabf5a66..fa780446eadd3 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java index 6c57754512a6b..b64435f858be2 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java index 5c65b6ce2b6df..66d1840e05d58 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java index 80783566da025..88f79e4c2c1de 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java @@ -1,13 +1,13 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.Entity; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.java index a83ca6dcecaa1..1b1e55e6544b6 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.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; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java index 3e11525313c98..05121d2421d06 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "NamedQueryEntity.getAll", query = "from NamedQueryEntity") diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java index 787dccf16f4ae..356118d6a38ad 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache; -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedQuery; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NamedQuery; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java index 4b773f8a78951..f9f8d47b20d8b 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java index a9398cba734b6..3d68bbd247dd2 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java index f39419dcdf900..6f81290b2c487 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java index c4bc848df0160..d1f6c2af5c03e 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.panache; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; /** * Run a simple, no paged PanacheQueryTest in order to log the generated SQL. diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java index ded253d4994d9..9c56fb443a5a0 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java index 28d3d869a3ab5..b566107a13838 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java index 25208a3a85dae..d252519c32f77 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java index fa05d4d3ba69b..86d255da0e388 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java @@ -3,19 +3,19 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.java index 805f66f4e3db9..8079899d72e23 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.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; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java index 8b74ce145ad59..9e7a871452481 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java @@ -14,19 +14,19 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.PersistenceException; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.inject.Inject; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.PersistenceException; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlTransient; import org.hibernate.engine.spi.SelfDirtinessTracker; import org.hibernate.jpa.QueryHints; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java index 35d34cfb46dbb..c6013403f609d 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java @@ -1,10 +1,10 @@ package io.quarkus.it.panache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java index 0f3919211d5ce..efc29128dc198 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java index 3228b2af75cbc..9852323a15e5c 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.quarkus.it.panache.Book; import io.quarkus.it.panache.BookDao; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java index 9758e67e051f7..0f307f61004cd 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java @@ -1,14 +1,14 @@ package io.quarkus.it.panache.resources; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; -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 javax.ws.rs.core.Response; +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 jakarta.ws.rs.core.Response; import io.quarkus.it.panache.UserRepository; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/PackagelessCat.java b/integration-tests/hibernate-orm-panache/src/test/java/PackagelessCat.java index 12ee2cbb26f8d..1de0447d00b45 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/PackagelessCat.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/PackagelessCat.java @@ -1,4 +1,4 @@ -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java index 96427e8a295e9..f6bb30397318d 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java index b01f84db73618..8fafb7585a474 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java @@ -1,8 +1,8 @@ package io.quarkus.it.panache; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; /** * An alternate implementation of {@link PersonRepository} to demonstrate that Repository entity type can be retrieved diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java index 74bd7aa1c7dd4..92aa37c3dccfe 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java @@ -6,12 +6,12 @@ import java.io.StringWriter; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; -import javax.transaction.Transactional; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.transaction.Transactional; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java index 8c0aeb9fa21dc..dc7e3ab03a255 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java @@ -3,9 +3,9 @@ import java.util.Collections; import java.util.Optional; -import javax.inject.Inject; -import javax.persistence.LockModeType; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.persistence.LockModeType; +import jakarta.ws.rs.WebApplicationException; import org.hibernate.Session; import org.hibernate.query.Query; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java index 53e8fa750b390..03a6bcc9c5ad7 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer.MethodName; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java index ff83e310aef86..f72061a3a3a67 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Author.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Author.java index 659d87e9b5edf..7de810fc82299 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Author.java +++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Author.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.orm.rest.data.panache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java index 8a39ac8fb4e33..8fd80eb337852 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java +++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java @@ -1,10 +1,10 @@ package io.quarkus.it.hibernate.orm.rest.data.panache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotBlank; @Entity public class Book { diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BookRepository.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BookRepository.java index 6a50d9474ac28..638a74329f10d 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BookRepository.java +++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BookRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.orm.rest.data.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java index dfde1ed01c63e..4e926a5cf2d6a 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java +++ b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java @@ -8,8 +8,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java index fcd78dad5d5b9..72003f7382341 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.jboss.logging.Logger; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java index 9daf91abe9f26..d25f847c67b84 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java @@ -1,11 +1,11 @@ package io.quarkus.it.hibernate.multitenancy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import io.quarkus.arc.Unremovable; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java index 7ba349289e117..45cf43533c932 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -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/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java index 24dc81505cc24..2d5e87ae053fd 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java @@ -1,14 +1,14 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -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.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java index a18b61a029f6f..44fb2aba771b0 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java @@ -2,24 +2,24 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.constraints.NotNull; -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.QueryParam; -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.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.constraints.NotNull; +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.QueryParam; +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 org.jboss.logging.Logger; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java index 0c331ff2595f5..cc87aa657e18b 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java index 48f3919c68d1e..b54162ef3c73f 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -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/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java index 3c1f0f7b1995c..fbd349700b542 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java @@ -2,12 +2,12 @@ import java.util.Objects; -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 jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "plane") diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java index 08f7c0db057cb..8f877b3bf675f 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java index 35e5de6513988..aeb0761160788 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java index fcd78dad5d5b9..72003f7382341 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantConnectionResolver.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.jboss.logging.Logger; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java index a6d2500f533c2..28aa28ba502eb 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/Producers.java @@ -1,10 +1,10 @@ package io.quarkus.it.hibernate.multitenancy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import io.quarkus.arc.Unremovable; import io.quarkus.hibernate.orm.PersistenceUnitExtension; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java index a45b5605fad5c..424bb8087c0c3 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -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/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java index 24dc81505cc24..2d5e87ae053fd 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java @@ -1,14 +1,14 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -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.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java index a18b61a029f6f..44fb2aba771b0 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java @@ -2,24 +2,24 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.constraints.NotNull; -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.QueryParam; -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.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.constraints.NotNull; +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.QueryParam; +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 org.jboss.logging.Logger; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java index 0c331ff2595f5..cc87aa657e18b 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java index 1f561516419b2..3dc77844c3102 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -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/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java index 3c1f0f7b1995c..fbd349700b542 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java @@ -2,12 +2,12 @@ import java.util.Objects; -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 jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "plane") diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java index 08f7c0db057cb..8f877b3bf675f 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java index 35e5de6513988..aeb0761160788 100644 --- a/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java +++ b/integration-tests/hibernate-orm-tenancy/connection-resolver/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java index a45b5605fad5c..424bb8087c0c3 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -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/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java index 24dc81505cc24..2d5e87ae053fd 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java @@ -1,14 +1,14 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -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.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java index a18b61a029f6f..44fb2aba771b0 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java @@ -2,24 +2,24 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.constraints.NotNull; -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.QueryParam; -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.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.constraints.NotNull; +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.QueryParam; +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 org.jboss.logging.Logger; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java index 0c331ff2595f5..cc87aa657e18b 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java index 1f561516419b2..3dc77844c3102 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -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/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java index 3c1f0f7b1995c..fbd349700b542 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java @@ -2,12 +2,12 @@ import java.util.Objects; -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 jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "plane") diff --git a/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java b/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java index 08f7c0db057cb..8f877b3bf675f 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java b/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java index 35e5de6513988..aeb0761160788 100644 --- a/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java +++ b/integration-tests/hibernate-orm-tenancy/datasource/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java index a45b5605fad5c..424bb8087c0c3 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -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/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java index 24dc81505cc24..2d5e87ae053fd 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java @@ -1,14 +1,14 @@ package io.quarkus.it.hibernate.multitenancy.fruit; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -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.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java index a18b61a029f6f..44fb2aba771b0 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java @@ -2,24 +2,24 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.constraints.NotNull; -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.QueryParam; -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.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.constraints.NotNull; +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.QueryParam; +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 org.jboss.logging.Logger; import org.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java index 0c331ff2595f5..cc87aa657e18b 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java index 1f561516419b2..3dc77844c3102 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.multitenancy.inventory; -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/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java index 3c1f0f7b1995c..fbd349700b542 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java @@ -2,12 +2,12 @@ import java.util.Objects; -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 jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "plane") diff --git a/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java b/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java index 08f7c0db057cb..8f877b3bf675f 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java b/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java index 35e5de6513988..aeb0761160788 100644 --- a/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java +++ b/integration-tests/hibernate-orm-tenancy/schema/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.is; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/GuineaPig.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/GuineaPig.java index c1b1e76a57a09..a0d95f29bf49d 100644 --- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/GuineaPig.java +++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/GuineaPig.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "Pig") @@ -59,4 +59,4 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(name); } -} \ No newline at end of file +} diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java index 6c6a4ed1364b8..aff8af60b2140 100644 --- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java +++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.reactive.db2; -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 org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java index 3ca8020f2c8b3..00cb438fd2ac9 100644 --- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java +++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.reactive.db2; -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 org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/GuineaPig.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/GuineaPig.java index d2b45bb57214b..96309df01c236 100644 --- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/GuineaPig.java +++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/GuineaPig.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "Pig") @@ -59,4 +59,4 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(name); } -} \ No newline at end of file +} diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java index 1a8b7c51377b8..ae2cc3f1aaba2 100644 --- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java +++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.reactive.mysql; -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 org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java index 84a90a6cd4ed8..360af9e0b2b52 100644 --- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java +++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.reactive.mysql; -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 org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/Fruit.java b/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/Fruit.java index e9c44f954f041..9f9cf94e297c2 100644 --- a/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/Fruit.java +++ b/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java b/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java index 7aa0925ae9c23..b42a1fb9cae7f 100644 --- a/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java +++ b/integration-tests/hibernate-reactive-panache-blocking/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.reactive.panache.Panache; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-reactive-panache-kotlin/pom.xml b/integration-tests/hibernate-reactive-panache-kotlin/pom.xml index 76b1439c1afa1..ea4efbb98edb0 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/pom.xml +++ b/integration-tests/hibernate-reactive-panache-kotlin/pom.xml @@ -213,7 +213,7 @@ all-open - + diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Address.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Address.kt index c141dd7071399..7dfc6729c4e42 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Address.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Address.kt @@ -2,7 +2,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class Address : PanacheEntity, Comparable

    { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/AddressDao.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/AddressDao.kt index 8a0ba6798268c..9b48dfe6db2ab 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/AddressDao.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/AddressDao.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class AddressDao : PanacheRepository
    diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5274EntityRepository.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5274EntityRepository.kt index a16f53a6de4be..ae17bc869149f 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5274EntityRepository.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5274EntityRepository.kt @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive.kotlin -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class Bug5274EntityRepository : AbstractRepository() diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5885EntityRepository.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5885EntityRepository.kt index 55a1cef63d1a8..701eabbb238e8 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5885EntityRepository.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug5885EntityRepository.kt @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive.kotlin -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class Bug5885EntityRepository : Bug5885AbstractRepository() diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721Entity.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721Entity.kt index c20ccb13884b7..28d6b41cefb40 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721Entity.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721Entity.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive.kotlin -import javax.persistence.Column -import javax.persistence.Entity +import jakarta.persistence.Column +import jakarta.persistence.Entity @Entity class Bug7721Entity : Bug7721EntitySuperClass() { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721EntitySuperClass.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721EntitySuperClass.kt index 5100b866b4d97..b88681a5bbd69 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721EntitySuperClass.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721EntitySuperClass.kt @@ -1,8 +1,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Column -import javax.persistence.MappedSuperclass +import jakarta.persistence.Column +import jakarta.persistence.MappedSuperclass @MappedSuperclass open class Bug7721EntitySuperClass : PanacheEntity() { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721OtherEntity.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721OtherEntity.kt index 48b9b3780d407..4fb1bf775e666 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721OtherEntity.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Bug7721OtherEntity.kt @@ -1,8 +1,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity +import jakarta.persistence.Entity import java.util.Locale -import javax.persistence.Entity @Entity class Bug7721OtherEntity : PanacheEntity() { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Cat.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Cat.kt index e3ff6574848e7..b253e14856670 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Cat.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Cat.kt @@ -2,8 +2,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity -import javax.persistence.ManyToOne +import jakarta.persistence.Entity +import jakarta.persistence.ManyToOne @Entity class Cat @JvmOverloads constructor( diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/CatOwner.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/CatOwner.kt index 0912b428e93b9..b17f37b023238 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/CatOwner.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/CatOwner.kt @@ -2,7 +2,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class CatOwner @JvmOverloads constructor(var name: String? = null) : PanacheEntity() { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Dog.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Dog.kt index c9354758fad32..b14a1a732ff9f 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Dog.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Dog.kt @@ -2,10 +2,10 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanionBase import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntityBase -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id -import javax.persistence.ManyToOne +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne @Entity class Dog() : PanacheEntityBase { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/DogDao.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/DogDao.kt index cd5eeb6632a2a..b1161352beb91 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/DogDao.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/DogDao.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheRepositoryBase -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class DogDao : PanacheRepositoryBase diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Fruit.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Fruit.kt index 5f81c7ff5a79a..8cd70426b640e 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Fruit.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Fruit.kt @@ -2,7 +2,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class Fruit : PanacheEntity { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryEntity.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryEntity.kt index 54cde3a0b973b..2a89d8b611738 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryEntity.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryEntity.kt @@ -1,8 +1,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion -import javax.persistence.Entity -import javax.persistence.NamedQuery +import jakarta.persistence.Entity +import jakarta.persistence.NamedQuery @Entity @NamedQuery(name = "NamedQueryEntity.getAll", query = "from NamedQueryEntity") diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryMappedSuperClass.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryMappedSuperClass.kt index 48301fa69f690..1d6a1a03650d4 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryMappedSuperClass.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryMappedSuperClass.kt @@ -1,8 +1,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.MappedSuperclass -import javax.persistence.NamedQuery +import jakarta.persistence.MappedSuperclass +import jakarta.persistence.NamedQuery @MappedSuperclass @NamedQuery(name = "NamedQueryMappedSuperClass.getAll", query = "from NamedQueryEntity") diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryRepository.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryRepository.kt index 00ed1a2f452f6..4d105d1b25432 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryRepository.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class NamedQueryRepository : PanacheRepository diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesEntity.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesEntity.kt index 13bebb5fd4aae..3b21346727a94 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesEntity.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesEntity.kt @@ -2,8 +2,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity -import javax.persistence.NamedQuery +import jakarta.persistence.Entity +import jakarta.persistence.NamedQuery @Entity @NamedQuery(name = "NamedQueryWith2QueriesEntity.getAll1", query = "from NamedQueryWith2QueriesEntity") diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesRepository.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesRepository.kt index 166ed085bc5ac..d50271f096a84 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesRepository.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NamedQueryWith2QueriesRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class NamedQueryWith2QueriesRepository : PanacheRepository diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NoPagingTestEndpoint.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NoPagingTestEndpoint.kt index f6ab1c9db961d..28cc8944cfd8e 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NoPagingTestEndpoint.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/NoPagingTestEndpoint.kt @@ -2,8 +2,8 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.Panache import io.smallrye.mutiny.Uni -import javax.ws.rs.GET -import javax.ws.rs.Path +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path /** * Run a simple, no paged PanacheQueryTest in order to log the generated SQL. diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithCompositeId.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithCompositeId.kt index d04a48dd8135b..3e7ed9c7034d8 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithCompositeId.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithCompositeId.kt @@ -2,10 +2,10 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanionBase import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntityBase +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.IdClass import java.io.Serializable -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.IdClass @Entity @IdClass(ObjectWithCompositeId.ObjectKey::class) diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithEmbeddableId.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithEmbeddableId.kt index f6afb7f2fc02c..190d0d74ce935 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithEmbeddableId.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/ObjectWithEmbeddableId.kt @@ -2,11 +2,11 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanionBase import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntityBase +import jakarta.persistence.Embeddable +import jakarta.persistence.EmbeddedId +import jakarta.persistence.Entity import java.io.Serializable import java.util.Objects -import javax.persistence.Embeddable -import javax.persistence.EmbeddedId -import javax.persistence.Entity @Entity class ObjectWithEmbeddableId : PanacheEntityBase { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PageItem.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PageItem.kt index c61dc299990bb..3af905c77f056 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PageItem.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PageItem.kt @@ -2,7 +2,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheCompanion import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity class PageItem : PanacheEntity() { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Person.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Person.kt index 707d3cc2c836f..fed249637b5c1 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Person.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/Person.kt @@ -6,22 +6,22 @@ import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity import io.quarkus.hibernate.reactive.panache.kotlin.PanacheQuery import io.quarkus.hibernate.reactive.panache.kotlin.runtime.KotlinJpaOperations.Companion.INSTANCE import io.smallrye.mutiny.Uni +import jakarta.persistence.CascadeType +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EnumType +import jakarta.persistence.Enumerated +import jakarta.persistence.FetchType +import jakarta.persistence.ManyToOne +import jakarta.persistence.NamedQueries +import jakarta.persistence.NamedQuery +import jakarta.persistence.OneToMany +import jakarta.persistence.Transient +import jakarta.xml.bind.annotation.XmlRootElement +import jakarta.xml.bind.annotation.XmlTransient import org.hibernate.annotations.Filter import org.hibernate.annotations.FilterDef import org.hibernate.annotations.ParamDef -import javax.persistence.CascadeType -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.EnumType -import javax.persistence.Enumerated -import javax.persistence.FetchType -import javax.persistence.ManyToOne -import javax.persistence.NamedQueries -import javax.persistence.NamedQuery -import javax.persistence.OneToMany -import javax.persistence.Transient -import javax.xml.bind.annotation.XmlRootElement -import javax.xml.bind.annotation.XmlTransient @XmlRootElement @NamedQueries( diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PersonRepository.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PersonRepository.kt index 2da80ab1dcfa5..fb5043d4270bb 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PersonRepository.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/PersonRepository.kt @@ -2,7 +2,7 @@ package io.quarkus.it.panache.reactive.kotlin import io.quarkus.hibernate.reactive.panache.kotlin.PanacheRepository import io.smallrye.mutiny.Uni -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class PersonRepository : PanacheRepository { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/TestEndpoint.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/TestEndpoint.kt index 3baa653361614..f0cfc823de404 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/TestEndpoint.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/reactive/kotlin/TestEndpoint.kt @@ -12,6 +12,12 @@ import io.quarkus.panache.common.Parameters.with import io.quarkus.panache.common.Sort import io.quarkus.panache.common.exception.PanacheQueryException import io.smallrye.mutiny.Uni +import jakarta.inject.Inject +import jakarta.persistence.LockModeType +import jakarta.persistence.NoResultException +import jakarta.persistence.NonUniqueResultException +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path import org.hibernate.engine.spi.SelfDirtinessTracker import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals @@ -19,12 +25,6 @@ import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue import java.util.function.Supplier import java.util.stream.Stream -import javax.inject.Inject -import javax.persistence.LockModeType -import javax.persistence.NoResultException -import javax.persistence.NonUniqueResultException -import javax.ws.rs.GET -import javax.ws.rs.Path @Path("test") class TestEndpoint { diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/PackagelessCat.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/PackagelessCat.kt index 888a29f9e573e..72d6018cfd22e 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/PackagelessCat.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/PackagelessCat.kt @@ -1,5 +1,5 @@ import io.quarkus.hibernate.reactive.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity open class PackagelessCat : PanacheEntity() diff --git a/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/reactive/kotlin/PanacheFunctionalityTest.kt b/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/reactive/kotlin/PanacheFunctionalityTest.kt index 33bfe9ba61a94..a327e7222a566 100644 --- a/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/reactive/kotlin/PanacheFunctionalityTest.kt +++ b/integration-tests/hibernate-reactive-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/reactive/kotlin/PanacheFunctionalityTest.kt @@ -12,6 +12,8 @@ import io.restassured.RestAssured.given import io.restassured.RestAssured.`when` import io.restassured.http.ContentType import io.smallrye.mutiny.Uni +import jakarta.json.bind.JsonbBuilder +import jakarta.persistence.PersistenceException import org.hamcrest.Matchers.`is` import org.hibernate.reactive.mutiny.Mutiny import org.junit.jupiter.api.Assertions @@ -20,8 +22,6 @@ import org.junit.jupiter.api.MethodOrderer import org.junit.jupiter.api.Order import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestMethodOrder -import javax.json.bind.JsonbBuilder -import javax.persistence.PersistenceException import kotlin.time.Duration.Companion.minutes import kotlin.time.toJavaDuration diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java index 3515738e2fc39..e9167862e6230 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; @Entity public class AccessorEntity extends GenericEntity { diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java index 9b82b52b19611..d1911ed6766d9 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java index 1dc6e9172175f..caef08a2ab0ca 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java index 7d79a8b3d6f96..9c8901a608f45 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java index ee7338b415ce1..0b387c6a29ff7 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Bug5274EntityRepository extends AbstractRepository { diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java index ce6fb987c0d10..793c584da61ed 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Bug5885EntityRepository extends Bug5885AbstractRepository { diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java index 635ff39bca71d..90f3613340bf6 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class Bug7721Entity extends Bug7721EntitySuperClass { diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java index e5d991e1c1371..024f57a60e105 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java index b604bf73800d0..b8871e9746502 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java index 131c750bcd7ba..a562c873bbcb3 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java index de49ecd6eca4e..d9dadb7b26100 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java index 1d385939b314d..9daf869ec3b0d 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java @@ -1,9 +1,9 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java index 269c337287a7d..dc6aa7517c032 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java index 2a342cebae598..20cdd63472394 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; import io.quarkus.panache.common.Parameters; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java index 67ac10d1ab825..c65e62e23a6d7 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java index e9c44f954f041..9f9cf94e297c2 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java index 9a65589b56f4e..9a03c60d7c22b 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java index 0caef64c25583..82b11ad778d32 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java index 5396e275d16dd..1b50c6332e23e 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "NamedQueryEntity.getAll", query = "from NamedQueryEntity") diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java index 11aa2641c4875..8e6dc542eb2aa 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.MappedSuperclass; -import javax.persistence.NamedQuery; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.NamedQuery; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java index 2cebb1bc1dcd0..3570cc2b6e572 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java index 5e932b5b1040f..0af0c53f31294 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; -import javax.persistence.NamedQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQuery; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java index 68f9473190ff7..7393597dc8cd1 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java index 8af355617be51..3e44dc877fa66 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java @@ -1,7 +1,7 @@ package io.quarkus.it.panache.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.reactive.panache.Panache; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java index 58f3b046b3297..a165684c815ec 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java index 6c34b2abe72af..d55c200edc282 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntityBase; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java index 29e16fce0a978..a4782c5c5dedc 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java @@ -1,6 +1,6 @@ package io.quarkus.it.panache.reactive; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java index 7482650a05f92..ac293dfbaa960 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java @@ -5,19 +5,19 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Transient; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java index 2edc51fb9d021..5f029dc2ee741 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java index 7046f84404eb3..e6c54a13562ae 100644 --- a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java +++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java @@ -11,12 +11,12 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.hibernate.engine.spi.SelfDirtinessTracker; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java b/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java index 549b164ed917a..05351ab74cb88 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java @@ -1,4 +1,4 @@ -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java index 8419afeb68cd7..f97ff95d0000f 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java index 7d5409009219a..6c34475cd9f51 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java @@ -1,8 +1,8 @@ package io.quarkus.it.panache.reactive; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; /** * An alternate implementation of {@link PersonRepository} to demonstrate that Repository entity type can be retrieved diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java index 4fa2980e03c05..5efc721fa7777 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java @@ -3,9 +3,9 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; -import javax.persistence.PersistenceException; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.persistence.PersistenceException; import org.hibernate.reactive.mutiny.Mutiny.Transaction; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java index c780914895b0a..78931c8cdbc42 100644 --- a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java +++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java @@ -2,9 +2,9 @@ import java.util.Collections; -import javax.inject.Inject; -import javax.persistence.LockModeType; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.persistence.LockModeType; +import jakarta.ws.rs.WebApplicationException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Order; diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/FriesianCow.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/FriesianCow.java index f47fa0a8dfc8d..51054825cd74e 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/FriesianCow.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/FriesianCow.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.reactive.postgresql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "Cow") diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/GuineaPig.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/GuineaPig.java index f045e2f8eb6e1..0ff88f16cb883 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/GuineaPig.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/GuineaPig.java @@ -2,9 +2,9 @@ import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "Pig") @@ -59,4 +59,4 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(name); } -} \ No newline at end of file +} diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java index 6e9d059efaa5b..19aab4e624bd5 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.reactive.postgresql; -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 org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java index ec7542caea526..95dd3aa3ca721 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.reactive.postgresql; -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 org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java index c0dcda200b2f5..ef84e12ef8de7 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointFetchLazy.java @@ -2,11 +2,11 @@ import java.util.Collection; -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 jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointJoinedSubclass.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointJoinedSubclass.java index dc875d15d5a75..fbbbc4d8d5e99 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointJoinedSubclass.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointJoinedSubclass.java @@ -2,17 +2,17 @@ import java.util.Objects; -import javax.inject.Inject; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Author.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Author.java index ab67fc157c138..b5584282a7047 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Author.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Author.java @@ -1,15 +1,15 @@ package io.quarkus.it.hibernate.reactive.postgresql.lazy; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; import java.util.ArrayList; import java.util.Collection; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; @Entity @Table diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Book.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Book.java index b0162376261b1..c495118326c1e 100644 --- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Book.java +++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/lazy/Book.java @@ -1,15 +1,15 @@ package io.quarkus.it.hibernate.reactive.postgresql.lazy; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.FetchType.LAZY; import java.util.Objects; -import javax.json.bind.annotation.JsonbTransient; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.json.bind.annotation.JsonbTransient; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/HibernateSearchOutboxPollingTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/HibernateSearchOutboxPollingTestResource.java index cbeaff615b7bb..97dcf76bcfa7f 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/HibernateSearchOutboxPollingTestResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/HibernateSearchOutboxPollingTestResource.java @@ -4,15 +4,15 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; -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.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; +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.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.session.SearchSession; diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/OutboxPollingTestUtils.java b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/OutboxPollingTestUtils.java index e6c6c557dc9ad..3391237bf34bc 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/OutboxPollingTestUtils.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/OutboxPollingTestUtils.java @@ -6,13 +6,13 @@ import java.time.Duration; import java.util.List; -import javax.persistence.EntityManager; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import jakarta.persistence.EntityManager; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/Person.java b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/Person.java index 5c984c0021581..cf99665a808b8 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/Person.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/coordination/outboxpolling/Person.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.coordination.outboxpolling; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.search.engine.backend.types.Sortable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/CustomTenantResolver.java b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/CustomTenantResolver.java index 41b51af45942a..81ee28f55ed1e 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/CustomTenantResolver.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/CustomTenantResolver.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.multitenancy.fruit; -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/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/Fruit.java b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/Fruit.java index 98e686121fb1f..bdd0990d5c3e1 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/Fruit.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/Fruit.java @@ -1,14 +1,14 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.multitenancy.fruit; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -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.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.xml.bind.annotation.XmlRootElement; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/FruitResource.java b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/FruitResource.java index 91dc15e76d69b..33411acc150d9 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/FruitResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/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.validation.constraints.NotNull; -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.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.validation.constraints.NotNull; +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.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/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/HibernateSearchTenancyFunctionalityTest.java b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/HibernateSearchTenancyFunctionalityTest.java index a2b864ee29643..b6c5e3c36b83d 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/HibernateSearchTenancyFunctionalityTest.java +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/test/java/io/quarkus/it/hibernate/search/orm/elasticsearch/multitenancy/fruit/HibernateSearchTenancyFunctionalityTest.java @@ -6,7 +6,7 @@ import java.util.List; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis0TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis0TestingEntity.java index 2910f17770c61..9c6f6d3c0864e 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis0TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis0TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis1TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis1TestingEntity.java index 1d0b4e827ff09..d06840de280a1 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis1TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis1TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis2TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis2TestingEntity.java index a4aaf1d66eeae..47097d6efc05a 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis2TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis2TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis3TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis3TestingEntity.java index bcb93acb4697d..f5dd0b02b33ac 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis3TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis3TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis4TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis4TestingEntity.java index 96be147fcf758..ef412b87b2abe 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis4TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis4TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis5TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis5TestingEntity.java index bdff671ec5337..f35e72fcc644c 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis5TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis5TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis6TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis6TestingEntity.java index 96c2044e029af..ed08b2199b8e9 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis6TestingEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/Analysis6TestingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestResource.java index 71ad260639d3a..8860b69cf88e3 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestResource.java @@ -4,14 +4,14 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.persistence.EntityManager; +import jakarta.transaction.Transactional; +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.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.common.EntityReference; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestingEntityBase.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestingEntityBase.java index 25e641b3442f4..33895effa6551 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestingEntityBase.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/AnalysisTestingEntityBase.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AnalysisTestingEntityBase { diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/BackendAnalysisConfigurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/BackendAnalysisConfigurer.java index 2852e5a726e0b..209bb6fb7a8c5 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/BackendAnalysisConfigurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/BackendAnalysisConfigurer.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis1Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis1Configurer.java index 24dd389ad2980..7f5dd1a994994 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis1Configurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis1Configurer.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis2Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis2Configurer.java index 8b4bba0e21765..d0076170907bf 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis2Configurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis2Configurer.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis3Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis3Configurer.java index 4808662a4406c..67dc581be44a4 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis3Configurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis3Configurer.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis4Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis4Configurer.java index 84a9b891cfafd..640bb1bd60789 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis4Configurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis4Configurer.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis5Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis5Configurer.java index a7df2280090e7..505de64211b12 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis5Configurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis5Configurer.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis6Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis6Configurer.java index 50d27ac62c1bd..bac03b9504486 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis6Configurer.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/IndexAnalysis6Configurer.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.analysis; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/MyCdiContext.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/MyCdiContext.java index a5a5000b35ca4..1d2c9e432beb9 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/MyCdiContext.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/analysis/MyCdiContext.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyCdiContext { diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/client/ElasticsearchClientTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/client/ElasticsearchClientTestResource.java index 95e45db840872..2365e97cca170 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/client/ElasticsearchClientTestResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/client/ElasticsearchClientTestResource.java @@ -5,10 +5,10 @@ import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; -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.apache.http.HttpHost; import org.elasticsearch.client.Request; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchDevServicesTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchDevServicesTestResource.java index 6e4dcadaca73b..2e270a3c6faa7 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchDevServicesTestResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/HibernateSearchDevServicesTestResource.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.transaction.Transactional; -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.transaction.Transactional; +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.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/IndexedEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/IndexedEntity.java index 2b8ccd28a8657..a0a95ae424166 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/IndexedEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/devservices/IndexedEntity.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.devservices; -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; import org.hibernate.search.engine.backend.types.Sortable; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/MethodAccessEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/MethodAccessEntity.java index efd1370c05ebf..2b609d982a2cb 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/MethodAccessEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/MethodAccessEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.propertyaccess; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java index 18e3e4cc67191..cad1bb43041a4 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.propertyaccess; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; import org.hibernate.annotations.LazyGroup; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PropertyAccessTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PropertyAccessTestResource.java index 2ffa8c2fc7917..afde4c950809e 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PropertyAccessTestResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/PropertyAccessTestResource.java @@ -2,18 +2,18 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; -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.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.hibernate.Hibernate; import org.hibernate.search.mapper.orm.session.SearchSession; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/TransientMethodAccessEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/TransientMethodAccessEntity.java index a4902da392326..32399bfbccb96 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/TransientMethodAccessEntity.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/propertyaccess/TransientMethodAccessEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.propertyaccess; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Address.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Address.java index dc2d1c507f3b9..61429b2db8d71 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Address.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Address.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/HibernateSearchTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/HibernateSearchTestResource.java index 9b6f19a7d644e..a0b0d5c4b1fe7 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/HibernateSearchTestResource.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/HibernateSearchTestResource.java @@ -4,14 +4,14 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.persistence.EntityManager; +import jakarta.transaction.Transactional; +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.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.session.SearchSession; diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Person.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Person.java index 1c8e7621f3cfb..ebea18d67cab8 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Person.java +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/orm/elasticsearch/search/Person.java @@ -1,12 +1,12 @@ package io.quarkus.it.hibernate.search.orm.elasticsearch.search; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/analysis/BackendAnalysisConfigurer.java b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/analysis/BackendAnalysisConfigurer.java index f791fdae93e41..654172c9e7f60 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/analysis/BackendAnalysisConfigurer.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/analysis/BackendAnalysisConfigurer.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.search.orm.opensearch.analysis; -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/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Address.java b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Address.java index 38d9b9da6be3b..9b6d023c365d1 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Address.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Address.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/HibernateSearchTestResource.java b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/HibernateSearchTestResource.java index c9900f1934159..f1efb48a0e17c 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/HibernateSearchTestResource.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/HibernateSearchTestResource.java @@ -4,14 +4,14 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.persistence.EntityManager; +import jakarta.transaction.Transactional; +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.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.session.SearchSession; diff --git a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Person.java b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Person.java index 1217305292787..aab987b7cfadd 100644 --- a/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Person.java +++ b/integration-tests/hibernate-search-orm-opensearch/src/main/java/io/quarkus/it/hibernate/search/orm/opensearch/search/Person.java @@ -1,12 +1,12 @@ package io.quarkus.it.hibernate.search.orm.opensearch.search; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Sortable; diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java index a63703882965e..a303234d932cd 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.validator; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; @Alternative @Priority(1) diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java index 99ab24f1d4980..2402201ed8172 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.validator; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.NotNull; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.NotNull; @ApplicationScoped @Priority(2) diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java index ada14f2cf6236..1e2a88aa3b3da 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java @@ -7,19 +7,19 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.Valid; -import javax.validation.Validator; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Email; -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.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Valid; +import jakarta.validation.Validator; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Email; +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.hibernate.validator.constraints.Length; import org.jboss.resteasy.reactive.RestPath; diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java index d2dfd4aa2222f..6b45a8986e34b 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator; -import javax.validation.constraints.Digits; +import jakarta.validation.constraints.Digits; public interface HibernateValidatorTestResourceGenericInterface { diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java index fe76470c7c252..b2f7981deb95a 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java @@ -1,11 +1,11 @@ package io.quarkus.it.hibernate.validator; -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; public interface HibernateValidatorTestResourceInterface { diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/TextResource.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/TextResource.java index 9d7a173286183..7813814e53031 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/TextResource.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/TextResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.hibernate.validator; -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("text") public class TextResource { diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java index ad412dea04eb5..5e75b6cb98da1 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java @@ -5,10 +5,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; @Target({ ElementType.TYPE_USE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java b/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java index 451c02b854216..c5db7e407f595 100644 --- a/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java +++ b/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java @@ -8,8 +8,8 @@ import java.util.logging.Level; import java.util.logging.LogManager; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.AfterEach; diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java index a63703882965e..a303234d932cd 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/EnhancedGreetingService.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.validator; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; @Alternative @Priority(1) diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java index 99ab24f1d4980..2402201ed8172 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/GreetingService.java @@ -1,8 +1,8 @@ package io.quarkus.it.hibernate.validator; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.validation.constraints.NotNull; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.validation.constraints.NotNull; @ApplicationScoped @Priority(2) diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java index ffba60c01f0ea..d286eeb5446d3 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java @@ -11,31 +11,31 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.interceptor.InterceptorBinding; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Valid; -import javax.validation.Validator; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Email; -import javax.validation.constraints.Pattern; -import javax.validation.groups.ConvertGroup; -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.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.interceptor.InterceptorBinding; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Valid; +import jakarta.validation.Validator; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.ConvertGroup; +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.core.MediaType; +import jakarta.ws.rs.core.Response; import org.hibernate.validator.constraints.Length; diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java index d2dfd4aa2222f..6b45a8986e34b 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator; -import javax.validation.constraints.Digits; +import jakarta.validation.constraints.Digits; public interface HibernateValidatorTestResourceGenericInterface { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java index fe76470c7c252..b2f7981deb95a 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java @@ -1,11 +1,11 @@ package io.quarkus.it.hibernate.validator; -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; public interface HibernateValidatorTestResourceInterface { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceSuperclass.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceSuperclass.java index 73b880e6345ce..d037654dc9eda 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceSuperclass.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceSuperclass.java @@ -1,11 +1,11 @@ package io.quarkus.it.hibernate.validator; -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; public class HibernateValidatorTestResourceSuperclass { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/Startup.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/Startup.java index f125580b52c46..139248b7d939f 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/Startup.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/Startup.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.enterprise.event.Observes; -import javax.validation.Validation; +import jakarta.enterprise.event.Observes; +import jakarta.validation.Validation; import io.quarkus.runtime.StartupEvent; diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeService.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeService.java index 6e48a72dab3af..814cd2b591919 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeService.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeService.java @@ -1,7 +1,7 @@ package io.quarkus.it.hibernate.validator; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; public interface ZipCodeService { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeServiceImpl.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeServiceImpl.java index 75f93ba0e6176..55c99683fedb4 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeServiceImpl.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/ZipCodeServiceImpl.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ZipCodeServiceImpl implements ZipCodeService { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java index ad412dea04eb5..5e75b6cb98da1 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java @@ -5,10 +5,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; @Target({ ElementType.TYPE_USE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/enums/MyEnumWithValidatorAnnotation.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/enums/MyEnumWithValidatorAnnotation.java index 4a701bb8345b6..364e87ef88997 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/enums/MyEnumWithValidatorAnnotation.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/enums/MyEnumWithValidatorAnnotation.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator.enums; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * Simply adding this class to the code, without even referencing it from anywhere, @@ -14,4 +14,4 @@ public enum MyEnumWithValidatorAnnotation { public static MyEnumWithValidatorAnnotation fromCode(@NotNull String code) { return MyEnumWithValidatorAnnotation.valueOf(code); } -} \ No newline at end of file +} diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java index 5faf3953390c0..f58b36217dffc 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.validator.groups; -import javax.validation.constraints.AssertFalse; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; +import jakarta.validation.constraints.AssertFalse; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Null; public class MyBeanWithGroups { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java index 21ee13ff6c503..0ed9a34ef6e17 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator.groups; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface ValidationGroups { interface Post extends Default { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java index bdf6a20ed0d91..c5fdf98202322 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.hibernate.validator.inheritance; -import javax.validation.constraints.NotNull; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; public interface BookResource { @@ -13,4 +13,4 @@ public interface BookResource { @GET @Produces(MediaType.TEXT_PLAIN) String hello(@NotNull @QueryParam("name") String name); -} \ No newline at end of file +} diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java index 98c883f0ec957..0202c698dc19c 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator.inheritance; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path(ScienceBookResource.PATH) public interface ScienceBookResource extends BookResource { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidator.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidator.java index 2e2bf562a98c9..00288bff566e6 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidator.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidator.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.validator.injection; -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 InjectedConstraintValidator implements ConstraintValidator { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidatorConstraint.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidatorConstraint.java index ec7e836e197f0..749ec2470ba7b 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidatorConstraint.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/InjectedConstraintValidatorConstraint.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ ElementType.TYPE_USE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/MyService.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/MyService.java index bd0fd8baf3eca..fd9bdd94a5d2d 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/MyService.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/injection/MyService.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.validator.injection; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyService { diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java index 25e0d77c20aa0..796c53c7f4e32 100644 --- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java +++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java @@ -1,9 +1,9 @@ package io.quarkus.it.hibernate.validator.orm; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.GenericGenerator; diff --git a/integration-tests/hibernate-validator/src/test/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizerTest.java b/integration-tests/hibernate-validator/src/test/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizerTest.java index b08b737fbbfae..03576025ba276 100644 --- a/integration-tests/hibernate-validator/src/test/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizerTest.java +++ b/integration-tests/hibernate-validator/src/test/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizerTest.java @@ -42,7 +42,7 @@ private static class Original { } /** - * Simulates an object injected through @{@link javax.inject.Inject}. + * Simulates an object injected through @{@link jakarta.inject.Inject}. */ private static class FirstSubclass extends Original implements Subclass { } diff --git a/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java b/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java index d995ca631e3c5..279d8d0370ff9 100644 --- a/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java +++ b/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java @@ -8,8 +8,8 @@ import java.util.logging.Level; import java.util.logging.LogManager; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.AfterEach; diff --git a/integration-tests/ide-launcher/src/main/java/io/quarkus/it/ide/launcher/HelloResource.java b/integration-tests/ide-launcher/src/main/java/io/quarkus/it/ide/launcher/HelloResource.java index 41569e69e06c4..a9c5742248e5c 100644 --- a/integration-tests/ide-launcher/src/main/java/io/quarkus/it/ide/launcher/HelloResource.java +++ b/integration-tests/ide-launcher/src/main/java/io/quarkus/it/ide/launcher/HelloResource.java @@ -1,7 +1,7 @@ package io.quarkus.it.ide.launcher; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello") public class HelloResource { diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Citizen.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Citizen.java index de173659b88b6..86e0441511639 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Citizen.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Citizen.java @@ -8,7 +8,7 @@ //$Id$ package io.quarkus.it.infinispan.cache.jpa; -import javax.persistence.*; +import jakarta.persistence.*; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Country.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Country.java index cde352f115d51..e8ea2bb39ecbf 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Country.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Country.java @@ -1,9 +1,9 @@ package io.quarkus.it.infinispan.cache.jpa; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityTestEndpoint.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityTestEndpoint.java index 063e247c99285..845306f73121e 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityTestEndpoint.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/InfinispanCacheJPAFunctionalityTestEndpoint.java @@ -3,20 +3,20 @@ import java.time.Duration; import java.util.*; -import javax.enterprise.context.ApplicationScoped; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -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.enterprise.context.ApplicationScoped; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +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.hibernate.NaturalIdLoadAccess; import org.hibernate.Session; diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Item.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Item.java index 05ca67055bb2b..c9baab9b847bd 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Item.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Item.java @@ -1,6 +1,6 @@ package io.quarkus.it.infinispan.cache.jpa; -import javax.persistence.*; +import jakarta.persistence.*; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Person.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Person.java index 815ff8cf57e4d..6baedfff8ac20 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Person.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Person.java @@ -1,6 +1,6 @@ package io.quarkus.it.infinispan.cache.jpa; -import javax.persistence.*; +import jakarta.persistence.*; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Pokemon.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Pokemon.java index ad4b0d0c82828..921195aeb7b31 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Pokemon.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Pokemon.java @@ -1,8 +1,8 @@ package io.quarkus.it.infinispan.cache.jpa; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Cacheable diff --git a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Trainer.java b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Trainer.java index 0ab0ca5e1b839..7a7af6ed27047 100644 --- a/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Trainer.java +++ b/integration-tests/infinispan-cache-jpa/src/main/java/io/quarkus/it/infinispan/cache/jpa/Trainer.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.List; -import javax.persistence.*; +import jakarta.persistence.*; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookStoreService.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookStoreService.java index 39c36b9fef208..b5f6ce098d602 100644 --- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookStoreService.java +++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookStoreService.java @@ -3,12 +3,12 @@ import java.math.BigDecimal; import java.util.Collections; -import javax.ws.rs.DELETE; -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.DELETE; +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.infinispan.client.CacheInvalidate; import io.quarkus.infinispan.client.CacheInvalidateAll; diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/CacheSetup.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/CacheSetup.java index 95c378cafbb00..1e6329b1a8f05 100644 --- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/CacheSetup.java +++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/CacheSetup.java @@ -10,9 +10,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -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/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/MarshallerConfiguration.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/MarshallerConfiguration.java index beead33aaa199..7e2a6b5d15bd6 100644 --- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/MarshallerConfiguration.java +++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/MarshallerConfiguration.java @@ -1,7 +1,7 @@ package io.quarkus.it.infinispan.client; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.infinispan.protostream.FileDescriptorSource; import org.infinispan.protostream.MessageMarshaller; diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java index c75e6cf594091..24d2f9f63add0 100644 --- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java +++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java @@ -8,17 +8,17 @@ import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -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.Consumes; +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.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.Search; diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java index 4c2d3ee1f8978..d9923371417ed 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java @@ -3,8 +3,8 @@ import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class AlphaObserver { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java index 4e7bbb9b1d1e3..17c888357c929 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java @@ -3,8 +3,8 @@ import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class BravoObserver { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerService.java index 70fbe8edf55b9..601afef349965 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerService.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerService.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class CapitalizerService { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerServiceSingleton.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerServiceSingleton.java index 59bbf7dc93974..b31c6ffd6d094 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerServiceSingleton.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/CapitalizerServiceSingleton.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class CapitalizerServiceSingleton { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyResource.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyResource.java index 1344507b5672e..7a629fe4f0214 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyResource.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.mockbean; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/dummy") public class DummyResource { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyService2.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyService2.java index 95c8ff9b9baa4..20eaaa793a8ff 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyService2.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyService2.java @@ -1,7 +1,7 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; @Named("second") @ApplicationScoped diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyServiceProducer.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyServiceProducer.java index aa6431c8b2d17..a7b066476d27d 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyServiceProducer.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/DummyServiceProducer.java @@ -1,8 +1,8 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; public class DummyServiceProducer { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooResource.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooResource.java index 17b8e97aa0973..6f17a44cf0b58 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooResource.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooResource.java @@ -2,9 +2,9 @@ import java.util.Collections; -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("foo") public class FooResource { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooService.java index e3325af996cc0..698f7313e4568 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooService.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/FooService.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class FooService { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResource.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResource.java index d3f79c7348568..64c8a4396e9d3 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResource.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.mockbean; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("greeting") public class GreetingResource { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResourceSingleton.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResourceSingleton.java index 222cd8d532623..20d8f9827632c 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResourceSingleton.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/GreetingResourceSingleton.java @@ -1,8 +1,8 @@ package io.quarkus.it.mockbean; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("greetingSingleton") public class GreetingResourceSingleton { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceImpl.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceImpl.java index 8adaee0784bef..3af9671aa933d 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceImpl.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceImpl.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MessageServiceImpl implements MessageService { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceSingletonImpl.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceSingletonImpl.java index 7bc34b0d40a7f..03f130cc4b4ba 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceSingletonImpl.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/MessageServiceSingletonImpl.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class MessageServiceSingletonImpl implements MessageServiceSingleton { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/OtherUnusedService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/OtherUnusedService.java index fbecc93edcd5f..4b1f0c3c50a2a 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/OtherUnusedService.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/OtherUnusedService.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * This gets removed removed by Arc since it's not being used in the application, diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java index 622f331392b77..b9b6589d3ae67 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java @@ -1,7 +1,7 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; public class SameBeanInstance { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java index 9abe827814401..db0e150756832 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SuffixService { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixServiceSingletonProducer.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixServiceSingletonProducer.java index be30268dfdeab..7288856034311 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixServiceSingletonProducer.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixServiceSingletonProducer.java @@ -1,7 +1,7 @@ package io.quarkus.it.mockbean; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; public class SuffixServiceSingletonProducer { diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/UnusedService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/UnusedService.java index c3902d2d17fb2..63206c28f4c5f 100644 --- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/UnusedService.java +++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/UnusedService.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * This would normally have been removed by Arc since it's not being used in the application, diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/DummyResourceTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/DummyResourceTest.java index 2db26072ccdfc..1c4b942ed31eb 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/DummyResourceTest.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/DummyResourceTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; -import javax.inject.Named; +import jakarta.inject.Named; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GenericFieldsTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GenericFieldsTest.java index dff578892827d..3cffaa136f972 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GenericFieldsTest.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/GenericFieldsTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.mockbean; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java index 7be20eb62196a..fb9075d9d22ff 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java @@ -6,8 +6,8 @@ import java.math.BigDecimal; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.event.Event; -import javax.inject.Inject; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerConsumer.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerConsumer.java index a1fe87b6b4710..be2b55e10e538 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerConsumer.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerConsumer.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class MyContainerConsumer { diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerProducer.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerProducer.java index 0311f40d6f959..b09ad08ef443a 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerProducer.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MyContainerProducer.java @@ -1,8 +1,8 @@ package io.quarkus.it.mockbean; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Singleton; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Produces; @Singleton public class MyContainerProducer { diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java index 4e3724e700143..8979dd408f102 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.*; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/WithSpiesTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/WithSpiesTest.java index 135213378ab4f..6392513c0440c 100644 --- a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/WithSpiesTest.java +++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/WithSpiesTest.java @@ -3,7 +3,7 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; -import javax.inject.Named; +import jakarta.inject.Named; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/src/main/java/org/acme/HelloEndpoint.java b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/src/main/java/org/acme/HelloEndpoint.java index 32d57f630205b..c5b7970070d74 100644 --- a/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/src/main/java/org/acme/HelloEndpoint.java +++ b/integration-tests/istio/maven-invoker-way/src/it/xds-grpc/src/main/java/org/acme/HelloEndpoint.java @@ -1,9 +1,9 @@ package org.acme; -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 examples.GreeterGrpc; import examples.HelloReply; @@ -34,4 +34,4 @@ public String hello() { } return response.getMessage(); } -} \ No newline at end of file +} diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/DateDeserializerPojoResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/DateDeserializerPojoResource.java index eef610aca91a8..d6ebd3c49a3f8 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/DateDeserializerPojoResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/DateDeserializerPojoResource.java @@ -2,12 +2,12 @@ import java.io.IOException; -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 com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/InheritedModelWithBuilderResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/InheritedModelWithBuilderResource.java index 401cbe0e0ad26..427c644fe3ec0 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/InheritedModelWithBuilderResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/InheritedModelWithBuilderResource.java @@ -2,12 +2,12 @@ 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 javax.ws.rs.core.Response; +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 io.quarkus.it.jackson.model.InheritedModelWithBuilder; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithBuilderResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithBuilderResource.java index ab68091944306..e9eaee1e55088 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithBuilderResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithBuilderResource.java @@ -2,12 +2,12 @@ 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 javax.ws.rs.core.Response; +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 io.quarkus.it.jackson.model.ModelWithBuilder; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonDeserializeUsingResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonDeserializeUsingResource.java index 78eaa6fb0f81b..6b8ffb6b655bd 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonDeserializeUsingResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonDeserializeUsingResource.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 com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java index 3fca6763547a8..0f78960a3c476 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java @@ -2,10 +2,10 @@ import java.io.IOException; -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 com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonTypeIdResolverResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonTypeIdResolverResource.java index e358cf1f716ff..92c4561af6686 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonTypeIdResolverResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonTypeIdResolverResource.java @@ -2,12 +2,12 @@ import java.io.IOException; -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 com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithSerializerDeserializerOnFieldResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithSerializerDeserializerOnFieldResource.java index 7950042725348..9b0b91576ea61 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithSerializerDeserializerOnFieldResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithSerializerDeserializerOnFieldResource.java @@ -2,13 +2,13 @@ import java.io.IOException; -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.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 com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/MyObjectMapperCustomizer.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/MyObjectMapperCustomizer.java index fe6e71ac479e2..0d8e6c96079e1 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/MyObjectMapperCustomizer.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/MyObjectMapperCustomizer.java @@ -1,6 +1,6 @@ package io.quarkus.it.jackson; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/RegisteredPojoModelResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/RegisteredPojoModelResource.java index 036bad701712d..1bc35797b8c18 100644 --- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/RegisteredPojoModelResource.java +++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/RegisteredPojoModelResource.java @@ -2,12 +2,12 @@ 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 javax.ws.rs.core.Response; +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 io.quarkus.it.jackson.model.RegisteredPojoModel; diff --git a/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/Person.java b/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/Person.java index e74e22b1a3994..c93442cdc243a 100644 --- a/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/Person.java +++ b/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/Person.java @@ -1,6 +1,6 @@ package io.quarkus.it.hibernate.panache.person; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/PersonResource.java b/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/PersonResource.java index 071c2679b7265..2744c1b059654 100644 --- a/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/PersonResource.java +++ b/integration-tests/java-17/src/main/java/io/quarkus/it/hibernate/panache/person/PersonResource.java @@ -3,11 +3,11 @@ import java.net.URI; import java.util.List; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("/hibernate/persons") @Transactional diff --git a/integration-tests/java-17/src/main/java/io/quarkus/it/mongodb/panache/person/PersonResource.java b/integration-tests/java-17/src/main/java/io/quarkus/it/mongodb/panache/person/PersonResource.java index c6b5ddac8e229..f719d5800ecf1 100644 --- a/integration-tests/java-17/src/main/java/io/quarkus/it/mongodb/panache/person/PersonResource.java +++ b/integration-tests/java-17/src/main/java/io/quarkus/it/mongodb/panache/person/PersonResource.java @@ -3,10 +3,10 @@ import java.net.URI; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("/mongo/persons") public class PersonResource { diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BaseObj.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BaseObj.java index 8f1d7472ce401..cabd8df3dbbcd 100644 --- a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BaseObj.java +++ b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/BaseObj.java @@ -7,10 +7,10 @@ package io.quarkus.it.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** *

    diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Book.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Book.java index a37cf99990e47..83ccdf0562e21 100644 --- a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Book.java +++ b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Book.java @@ -2,7 +2,7 @@ import java.awt.Image; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Book { diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/ExtensionOfBaseObj.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/ExtensionOfBaseObj.java index f56e2cc2b2a6d..e3e0378e60e7d 100644 --- a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/ExtensionOfBaseObj.java +++ b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/ExtensionOfBaseObj.java @@ -7,10 +7,10 @@ package io.quarkus.it.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; /** *

    diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/JaxbResource.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/JaxbResource.java index a4779e003641f..b03507a82089e 100644 --- a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/JaxbResource.java +++ b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/JaxbResource.java @@ -2,18 +2,18 @@ import java.io.StringWriter; -import javax.enterprise.context.ApplicationScoped; -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 javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.enterprise.context.ApplicationScoped; +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 jakarta.ws.rs.core.Response; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.jboss.logging.Logger; diff --git a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Response.java b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Response.java index 256f81ae8694b..a93d8a474bc73 100644 --- a/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Response.java +++ b/integration-tests/jaxb/src/main/java/io/quarkus/it/jaxb/Response.java @@ -7,11 +7,11 @@ package io.quarkus.it.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** *

    diff --git a/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java b/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java index d6fe51caf9720..f366fb23ad931 100644 --- a/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java +++ b/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java @@ -5,14 +5,6 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.enterprise.context.ApplicationScoped; -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 javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -26,6 +18,15 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import jakarta.enterprise.context.ApplicationScoped; +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.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Address.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Address.java index a473d1cb87767..4c46410d857bb 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Address.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Address.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.db2; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * This is an enmarked @Embeddable class. diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Customer.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Customer.java index b0ebf79488a49..09a1c5e09f043 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Customer.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Customer.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.db2; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Used to test reflection references for JPA diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Human.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Human.java index dddb023b353cc..98de61145d257 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Human.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Human.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.db2; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * Mapped superclass test diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/JPAFunctionalityTestEndpoint.java index 0169577b8fbb8..640c71d6bef9c 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/JPAFunctionalityTestEndpoint.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Various tests covering JPA functionality. All tests should work in both standard JVM and native mode. diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Person.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Person.java index 340ee10a5edbc..48a27d4c91b51 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Person.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/Person.java @@ -1,13 +1,13 @@ package io.quarkus.it.jpa.db2; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "get_person_by_name", query = "select p from Person p where name = :name") diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/SequencedAddress.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/SequencedAddress.java index 73037d41250ae..1f83a5163f153 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/SequencedAddress.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.db2; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/WorkAddress.java b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/WorkAddress.java index dadea80c1a306..41df906725024 100644 --- a/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/WorkAddress.java +++ b/integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/WorkAddress.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.db2; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * Class marked @Embeddable explicitly so it is picked up. diff --git a/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/JPAFunctionalityTestEndpoint.java index 9a14a860708f7..a9af63f103299 100644 --- a/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/JPAFunctionalityTestEndpoint.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic test running JPA with the Derby database. diff --git a/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/Person.java b/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/Person.java index 282cb6c3826dd..89b009ddee04b 100644 --- a/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/Person.java +++ b/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/Person.java @@ -2,13 +2,13 @@ import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; import org.hibernate.annotations.GenericGenerator; diff --git a/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/SequencedAddress.java b/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/SequencedAddress.java index e7281cdc3fda3..739fffd256b69 100644 --- a/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/SequencedAddress.java +++ b/integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.derby; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java index 1909d99cd6865..ae88d6721c91b 100644 --- a/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java @@ -6,18 +6,18 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic test running JPA with the H2 database. diff --git a/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/Person.java b/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/Person.java index 2b32e4765b499..4c614be7dfdf8 100644 --- a/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/Person.java +++ b/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/Person.java @@ -2,13 +2,13 @@ import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; import org.hibernate.annotations.GenericGenerator; diff --git a/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java b/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java index 0e836a42bc192..05e88210bb1a6 100644 --- a/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java +++ b/integration-tests/jpa-h2-embedded/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.h2; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/CompanyCustomer.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/CompanyCustomer.java index f1bbfa94a738e..7e03220c7a8e2 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/CompanyCustomer.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/CompanyCustomer.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * This entity is intentionally marked as final: diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Customer.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Customer.java index 0d8b419f7cde3..960a417b6bff1 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Customer.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Customer.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public abstract class Customer { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/DataIdentity.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/DataIdentity.java index 004718a1958cf..4567f659550a7 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/DataIdentity.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/DataIdentity.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; /** * This entity isn't directly referenced: its mere presence is @@ -33,4 +33,4 @@ public Long getVersion() { public void setVersion(Long version) { this.version = version; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IdVersionPK.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IdVersionPK.java index a74f13922c70d..96cb9a5a6b33a 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IdVersionPK.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IdVersionPK.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Id; +import jakarta.persistence.Id; /** * This entity isn't directly referenced: its mere presence is diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IndividualCustomer.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IndividualCustomer.java index 9a2903cdb6f82..e76267b2e731b 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IndividualCustomer.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/IndividualCustomer.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class IndividualCustomer extends Customer { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java index 88dd1daa874cc..7bee0dee96928 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/JPAFunctionalityTestEndpoint.java @@ -6,18 +6,18 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.wildfly.common.Assert; diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/NormalPointEntity.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/NormalPointEntity.java index d96c491e22196..88eb48cbede94 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/NormalPointEntity.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/NormalPointEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * This entity isn't directly referenced: its mere presence is diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Person.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Person.java index 2b32e4765b499..4c614be7dfdf8 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Person.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Person.java @@ -2,13 +2,13 @@ import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; import org.hibernate.annotations.GenericGenerator; diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/PointEntity.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/PointEntity.java index ad02db9bff5c9..eb6c753c619dc 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/PointEntity.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/PointEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * This entity isn't directly referenced: its mere presence is @@ -18,4 +18,4 @@ public String getName() { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Project.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Project.java index e1da2220de493..b7ad744063c37 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Project.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Project.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.h2; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Project { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java index 0e836a42bc192..05e88210bb1a6 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.h2; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Timeslot.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Timeslot.java index 1223ec7dd3280..603a57c690738 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Timeslot.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/Timeslot.java @@ -3,10 +3,10 @@ import java.time.DayOfWeek; import java.time.LocalTime; -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; /** * This entity is using a DynamicParameterizedType as it's using Enum fields. diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/AbstractEntity.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/AbstractEntity.java index f6cabfad73cca..4816191b0cba5 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/AbstractEntity.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/AbstractEntity.java @@ -3,11 +3,11 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "ENTITY") diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/BasicProxyTestEndpoint.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/BasicProxyTestEndpoint.java index 09f40f6444c4a..47a866369e6d5 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/BasicProxyTestEndpoint.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/BasicProxyTestEndpoint.java @@ -3,15 +3,15 @@ import java.io.IOException; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.transaction.Transactional; import io.quarkus.runtime.StartupEvent; diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/ConcreteEntity.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/ConcreteEntity.java index 8fe3af92cc995..ba1b07d4bac83 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/ConcreteEntity.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/basicproxy/ConcreteEntity.java @@ -1,7 +1,7 @@ package io.quarkus.it.jpa.h2.basicproxy; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Concrete") @@ -11,4 +11,4 @@ public ConcreteEntity() { super(); } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java index 684626b7f593e..d93b8d28d0a74 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.h2.generics; -import javax.persistence.Basic; -import javax.persistence.Lob; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Basic; +import jakarta.persistence.Lob; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractGenericMappedSuperType { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java index 6dd5554e17324..fb1ca748d3671 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass @IdClass(IntermediateAbstractMapped.PK.class) diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java index ea7f540582697..f44a4f87dc7b2 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.h2.generics; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * This strange mapping is useful to verify that Hibernate ORM can diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Cat.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Cat.java index 8f807747976d3..b1ff52532b1e4 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Cat.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Cat.java @@ -1,7 +1,7 @@ package io.quarkus.it.jpa.h2.proxy; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Dog.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Dog.java index 1118c107bb150..6be1e4e5ac330 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Dog.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Dog.java @@ -1,7 +1,7 @@ package io.quarkus.it.jpa.h2.proxy; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import org.hibernate.annotations.Proxy; diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Pet.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Pet.java index 709ee34443aaf..fad96348116ea 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Pet.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/Pet.java @@ -1,10 +1,10 @@ package io.quarkus.it.jpa.h2.proxy; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; import org.hibernate.annotations.Proxy; diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/PetOwner.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/PetOwner.java index 3376ede10074d..93fe8efa7c6fb 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/PetOwner.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/PetOwner.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.h2.proxy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class PetOwner { diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/ProxyTestEndpoint.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/ProxyTestEndpoint.java index f9d23b81c847b..9e592ac9e98c8 100644 --- a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/ProxyTestEndpoint.java +++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/proxy/ProxyTestEndpoint.java @@ -2,16 +2,16 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.transaction.Transactional; import io.quarkus.narayana.jta.runtime.TransactionConfiguration; import io.quarkus.runtime.StartupEvent; diff --git a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/DummyTransactionalService.java b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/DummyTransactionalService.java index 3c8b829c76164..58231f7118b63 100644 --- a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/DummyTransactionalService.java +++ b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/DummyTransactionalService.java @@ -1,7 +1,7 @@ package io.quarkus.it.jpa.h2; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; import io.quarkus.narayana.jta.runtime.TransactionConfiguration; import io.quarkus.narayana.jta.runtime.interceptor.RunnableWithException; diff --git a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TransactionConfigurationTest.java b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TransactionConfigurationTest.java index 8a6c1eb3a4a7d..ed9ba744fb5c1 100644 --- a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TransactionConfigurationTest.java +++ b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TransactionConfigurationTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.inject.Inject; -import javax.transaction.RollbackException; +import jakarta.inject.Inject; +import jakarta.transaction.RollbackException; import org.junit.jupiter.api.Test; diff --git a/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/LegacyAppResource.java b/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/LegacyAppResource.java index fa8ff32361490..afbfb9bfde09a 100644 --- a/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/LegacyAppResource.java +++ b/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/LegacyAppResource.java @@ -2,14 +2,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.orm.PersistenceUnit; import io.quarkus.it.jpa.mapping.xml.legacy.library_a.LibraryAEntity; diff --git a/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SchemaUtil.java b/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SchemaUtil.java index 4910d1b0347fe..bf4ede5b91fe5 100644 --- a/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SchemaUtil.java +++ b/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SchemaUtil.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.AbstractEntityPersister; diff --git a/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SmokeTestUtils.java b/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SmokeTestUtils.java index a260bda3f1242..46bd3a5e36c6e 100644 --- a/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SmokeTestUtils.java +++ b/integration-tests/jpa-mapping-xml/legacy-app/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/app/SmokeTestUtils.java @@ -5,7 +5,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Very simple reusable tests that simply check that persistence doesn't seem to explode. diff --git a/integration-tests/jpa-mapping-xml/legacy-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_a/LibraryAEntity.java b/integration-tests/jpa-mapping-xml/legacy-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_a/LibraryAEntity.java index 2eb45ccff5fa4..4197e980c1cd6 100644 --- a/integration-tests/jpa-mapping-xml/legacy-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_a/LibraryAEntity.java +++ b/integration-tests/jpa-mapping-xml/legacy-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_a/LibraryAEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mapping.xml.legacy.library_a; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * An annotated entity whose mapping is overridden in orm.xml. @@ -39,4 +39,4 @@ public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-mapping-xml/legacy-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_b/LibraryBEntity.java b/integration-tests/jpa-mapping-xml/legacy-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_b/LibraryBEntity.java index ee1a06f9dd130..78530d30061b8 100644 --- a/integration-tests/jpa-mapping-xml/legacy-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_b/LibraryBEntity.java +++ b/integration-tests/jpa-mapping-xml/legacy-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/legacy/library_b/LibraryBEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mapping.xml.legacy.library_b; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * An annotated entity whose mapping is overridden in orm.xml. @@ -39,4 +39,4 @@ public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/ModernAppResource.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/ModernAppResource.java index 573cfa07c9c7f..c30406dccda1a 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/ModernAppResource.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/ModernAppResource.java @@ -2,14 +2,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.orm.PersistenceUnit; import io.quarkus.it.jpa.mapping.xml.modern.library_a.LibraryAEntity; diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SchemaUtil.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SchemaUtil.java index e880aebfa13bc..6a2bf1e9df028 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SchemaUtil.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SchemaUtil.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.persister.entity.AbstractEntityPersister; diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SmokeTestUtils.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SmokeTestUtils.java index 02e30ffe1b262..3e5b0e76680d0 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SmokeTestUtils.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/SmokeTestUtils.java @@ -5,7 +5,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Very simple reusable tests that simply check that persistence doesn't seem to explode. diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyCdiContext.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyCdiContext.java index b0743f2b40915..d45cbb78e0c24 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyCdiContext.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyCdiContext.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyCdiContext { diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyConverter.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyConverter.java index c4a1496c54ae3..b085b41195359 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyConverter.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/MyConverter.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mapping.xml.modern.app.xmlmappingonly.attributeconverter; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.AttributeConverter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.AttributeConverter; @ApplicationScoped public class MyConverter implements AttributeConverter { diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/XmlMappingOnlyAttributeConverterResource.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/XmlMappingOnlyAttributeConverterResource.java index 950f7e77fc6db..38a8e20f371d5 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/XmlMappingOnlyAttributeConverterResource.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/attributeconverter/XmlMappingOnlyAttributeConverterResource.java @@ -2,13 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.hibernate.Session; diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/dirtychecking/XmlMappingOnlyDirtyCheckingResource.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/dirtychecking/XmlMappingOnlyDirtyCheckingResource.java index 3d1edf399174b..13baffeed1c70 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/dirtychecking/XmlMappingOnlyDirtyCheckingResource.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/dirtychecking/XmlMappingOnlyDirtyCheckingResource.java @@ -2,14 +2,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.hibernate.orm.PersistenceUnit; diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/EntityWithListenerThroughInstanceMethods.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/EntityWithListenerThroughInstanceMethods.java index bf76fa8377bd8..18624d600edc3 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/EntityWithListenerThroughInstanceMethods.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/EntityWithListenerThroughInstanceMethods.java @@ -2,13 +2,13 @@ import java.lang.annotation.Annotation; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; public class EntityWithListenerThroughInstanceMethods { private Integer id; diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyCdiContext.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyCdiContext.java index 22f6fd3ac1381..4ba45ca60df59 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyCdiContext.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyCdiContext.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyCdiContext { diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyListenerRequiringCdi.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyListenerRequiringCdi.java index f24241d6fd202..efcec301371c7 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyListenerRequiringCdi.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/MyListenerRequiringCdi.java @@ -3,15 +3,15 @@ import java.lang.annotation.Annotation; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; import io.quarkus.arc.ClientProxy; diff --git a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/XmlMappingOnlyEntityListenerResource.java b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/XmlMappingOnlyEntityListenerResource.java index d7ff74ed92d01..a12e4927c0fce 100644 --- a/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/XmlMappingOnlyEntityListenerResource.java +++ b/integration-tests/jpa-mapping-xml/modern-app/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/app/xmlmappingonly/entitylistener/XmlMappingOnlyEntityListenerResource.java @@ -6,21 +6,21 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.ListAssert; diff --git a/integration-tests/jpa-mapping-xml/modern-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_a/LibraryAEntity.java b/integration-tests/jpa-mapping-xml/modern-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_a/LibraryAEntity.java index fd9a7d2d6a15a..3f39b73e4a056 100644 --- a/integration-tests/jpa-mapping-xml/modern-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_a/LibraryAEntity.java +++ b/integration-tests/jpa-mapping-xml/modern-library-a/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_a/LibraryAEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mapping.xml.modern.library_a; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * An annotated entity whose mapping is overridden in orm.xml. @@ -39,4 +39,4 @@ public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-mapping-xml/modern-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_b/LibraryBEntity.java b/integration-tests/jpa-mapping-xml/modern-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_b/LibraryBEntity.java index 79eba14bed5bc..145c346d8fd82 100644 --- a/integration-tests/jpa-mapping-xml/modern-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_b/LibraryBEntity.java +++ b/integration-tests/jpa-mapping-xml/modern-library-b/src/main/java/io/quarkus/it/jpa/mapping/xml/modern/library_b/LibraryBEntity.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mapping.xml.modern.library_b; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * An annotated entity whose mapping is overridden in orm.xml. @@ -39,4 +39,4 @@ public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Address.java b/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Address.java index fc56da5d3c8a1..c21e7b89ec6f5 100644 --- a/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Address.java +++ b/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Address.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mariadb; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Address { diff --git a/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityTestEndpoint.java index 21f6c11931ced..5ef902b81a532 100644 --- a/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/JPAFunctionalityTestEndpoint.java @@ -8,21 +8,22 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Basic test running JPA with the MariaDB database. * The application can work in either standard JVM or in native mode. diff --git a/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Person.java b/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Person.java index c88c645e89721..6c9b119ea191d 100644 --- a/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Person.java +++ b/integration-tests/jpa-mariadb/src/main/java/io/quarkus/it/jpa/mariadb/Person.java @@ -1,12 +1,12 @@ package io.quarkus.it.jpa.mariadb; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "get_person_by_name", query = "select p from Person p where name = :name") diff --git a/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTestEndpoint.java index a6688d1e92ec9..97742a9c07f6d 100644 --- a/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTestEndpoint.java @@ -6,18 +6,18 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic test running JPA with the MS SQL database. diff --git a/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/Person.java b/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/Person.java index c88571ec5a38e..45d2d78f44389 100644 --- a/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/Person.java +++ b/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/Person.java @@ -1,13 +1,13 @@ package io.quarkus.it.jpa.mssql; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "get_person_by_name", query = "select p from Person p where name = :name") diff --git a/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/SequencedAddress.java b/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/SequencedAddress.java index 23fe24839efac..dc22c3badcf75 100644 --- a/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/SequencedAddress.java +++ b/integration-tests/jpa-mssql/src/main/java/io/quarkus/it/jpa/mssql/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.mssql; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Address.java b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Address.java index f7fc57544188e..be513a8c8e42b 100644 --- a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Address.java +++ b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Address.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.mysql; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Address { diff --git a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/JPAFunctionalityTestEndpoint.java index 4430f273794f3..bf56125c690db 100644 --- a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/JPAFunctionalityTestEndpoint.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceUnit; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic test running JPA with the MySQL database. diff --git a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Person.java b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Person.java index 812ea9ceae5d2..8c9db2e3cc5b6 100644 --- a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Person.java +++ b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/Person.java @@ -1,12 +1,12 @@ package io.quarkus.it.jpa.mysql; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "get_person_by_name", query = "select p from Person p where name = :name") diff --git a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java index c2b333c1731b9..d0598a29513f6 100644 --- a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java +++ b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java @@ -4,11 +4,11 @@ import java.sql.Connection; import java.sql.SQLException; -import javax.inject.Inject; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.agroal.api.AgroalDataSource; import io.agroal.api.configuration.AgroalConnectionFactoryConfiguration; diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/JPAFunctionalityTestEndpoint.java index d0653dbd5494b..df7d6663dfa97 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/JPAFunctionalityTestEndpoint.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic test running JPA with the Oracle database. diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/LdapUrlTestEndpoint.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/LdapUrlTestEndpoint.java index 6a63b9e4ffdbf..3d3b174e33818 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/LdapUrlTestEndpoint.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/LdapUrlTestEndpoint.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.sql.SQLException; -import javax.inject.Inject; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.logging.Logger; diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/Person.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/Person.java index 5fef60c433b03..65c44897f2bb6 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/Person.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/Person.java @@ -1,13 +1,13 @@ package io.quarkus.example.jpaoracle; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; @Entity @NamedQuery(name = "get_person_by_name", query = "select p from Person p where name = :name") diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SequencedAddress.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SequencedAddress.java index 8bd334f9f636a..2b5140b785cbc 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SequencedAddress.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.example.jpaoracle; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SerializationTestEndpoint.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SerializationTestEndpoint.java index f7ceff23e79ab..4b5f8c23ea238 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SerializationTestEndpoint.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/SerializationTestEndpoint.java @@ -6,10 +6,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "JPATestOracleSerialization", urlPatterns = "/jpa-oracle/testserialization") public class SerializationTestEndpoint extends HttpServlet { diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEndpoint.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEndpoint.java index 44bf23f487816..fd0d171782ad2 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEndpoint.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEndpoint.java @@ -8,16 +8,16 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.transaction.Transactional; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.transaction.Transactional; import io.agroal.api.AgroalDataSource; import io.quarkus.arc.Arc; diff --git a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEntity.java b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEntity.java index 8c6d94e3e8635..a1f4751196058 100644 --- a/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEntity.java +++ b/integration-tests/jpa-oracle/src/main/java/io/quarkus/example/jpaoracle/procedurecall/ProcedureCallEntity.java @@ -1,8 +1,8 @@ package io.quarkus.example.jpaoracle.procedurecall; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity(name = ProcedureCallEntity.NAME) public class ProcedureCallEntity { diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java index 148b96975e336..e8f1a786615cc 100644 --- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java @@ -12,18 +12,6 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; import javax.xml.transform.Result; import javax.xml.transform.Source; @@ -33,6 +21,19 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * First we run a smoke test for basic Hibernate ORM functionality, * then we specifically focus on supporting the PgSQLXML mapping abilities for XML types: diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java index 9602f843afa0d..d43892763452c 100644 --- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java +++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java @@ -1,14 +1,14 @@ package io.quarkus.it.jpa.postgresql; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java index b61623640c53d..99a659838cd1a 100644 --- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java +++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.postgresql; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java index 9c3827926e609..7da64d96144e6 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.postgresql; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * This is an enmarked @Embeddable class. diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java index 0a25581c9b1f7..d61b16d528613 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.postgresql; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Used to test reflection references for JPA diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java index a44faa216253e..0081919382064 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.postgresql; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * Mapped superclass test diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java index e2f391b29a036..6b2af30915ad4 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Various tests covering JPA functionality. All tests should work in both standard JVM and in native mode. diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java index 33b118501a378..705eae8071dea 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java @@ -5,10 +5,10 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Various tests for the JPA integration. diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java index 9d98e4201621c..0393fd951f115 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java @@ -1,14 +1,14 @@ package io.quarkus.it.jpa.postgresql; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(schema = "myschema") diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java index b61623640c53d..99a659838cd1a 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.postgresql; -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 public class SequencedAddress { diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java index 33bae7211bb2a..b4aa1f46fd456 100644 --- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java +++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.postgresql; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * Class marked @Embeddable explicitly so it is picked up. diff --git a/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/OverrideJdbcUrlBuildTimeConfigSource.java b/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/OverrideJdbcUrlBuildTimeConfigSource.java index 433c9737c0af2..464fde7db28d3 100644 --- a/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/OverrideJdbcUrlBuildTimeConfigSource.java +++ b/integration-tests/jpa-postgresql/src/test/java/io/quarkus/it/jpa/postgresql/OverrideJdbcUrlBuildTimeConfigSource.java @@ -2,7 +2,7 @@ import java.util.HashMap; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.spi.ConfigSource; diff --git a/integration-tests/jpa-without-entity/src/main/java/org/test/HelloResource.java b/integration-tests/jpa-without-entity/src/main/java/org/test/HelloResource.java index a84aad8f378bc..a19d541b2433e 100644 --- a/integration-tests/jpa-without-entity/src/main/java/org/test/HelloResource.java +++ b/integration-tests/jpa-without-entity/src/main/java/org/test/HelloResource.java @@ -1,9 +1,9 @@ package org.test; -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("/jpa-without-entity") public class HelloResource { @@ -13,4 +13,4 @@ public class HelloResource { public String hello() { return "hello without jpa"; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java index d3f8acf9a6f86..bcf2fdab0c75b 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.jpa.attributeconverter; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +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.annotations.jaxrs.QueryParam; diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java index 9261d9b662105..8fdc9445435cb 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.attributeconverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class EntityWithAttributeConverters { @@ -40,4 +40,4 @@ public MyDataNotRequiringCDI getMyDataNotRequiringCDI() { public void setMyDataNotRequiringCDI(MyDataNotRequiringCDI myDataNotRequiringCDI) { this.myDataNotRequiringCDI = myDataNotRequiringCDI; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java index e1aadac6e2762..4870fec88ea6b 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyCdiContext { diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java index 49d88e5376fde..cbafae9fe3a2d 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.attributeconverter; -import javax.inject.Inject; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.inject.Inject; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class MyDataNotRequiringCDIConverter implements AttributeConverter { diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java index 59686baf68215..f7dd79f368f9a 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.attributeconverter; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter @ApplicationScoped diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/CRUDResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/CRUDResource.java index f51b59dacb89f..80e484722e418 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/CRUDResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/CRUDResource.java @@ -3,15 +3,15 @@ import java.util.HashMap; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.hibernate.cache.spi.TimestampsCache; import org.hibernate.internal.SessionImpl; diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Cake.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Cake.java index 25c68153e1b56..55afc4004de57 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Cake.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Cake.java @@ -1,11 +1,11 @@ package io.quarkus.it.jpa.configurationless; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; @Entity @Table(uniqueConstraints = @UniqueConstraint(name = "typeConstraint", columnNames = "type")) diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/ConfigurationlessApp.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/ConfigurationlessApp.java index d0c8f04159548..6c01cf18dc7c0 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/ConfigurationlessApp.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/ConfigurationlessApp.java @@ -1,7 +1,7 @@ package io.quarkus.it.jpa.configurationless; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * @author Emmanuel Bernard emmanuel@hibernate.org diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Gift.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Gift.java index a3d125095ff0b..4c1eb86a84b3a 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Gift.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/Gift.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.configurationless; -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; /** * @author Emmanuel Bernard emmanuel@hibernate.org diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/StartupCakeManager.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/StartupCakeManager.java index 5d310d66fd756..e81468c6ef35f 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/StartupCakeManager.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/configurationless/StartupCakeManager.java @@ -1,10 +1,10 @@ package io.quarkus.it.jpa.configurationless; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; import io.quarkus.runtime.StartupEvent; diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/DefaultCatalogAndSchemaResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/DefaultCatalogAndSchemaResource.java index f24399e96fc45..eeb07ca0cdcd3 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/DefaultCatalogAndSchemaResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/DefaultCatalogAndSchemaResource.java @@ -4,13 +4,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.hibernate.Session; import org.hibernate.type.LongType; diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/EntityWithDefaultCatalogAndSchema.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/EntityWithDefaultCatalogAndSchema.java index 3817e8fdf74fe..15ff265835220 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/EntityWithDefaultCatalogAndSchema.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/defaultcatalogandschema/EntityWithDefaultCatalogAndSchema.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa.defaultcatalogandschema; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity(name = EntityWithDefaultCatalogAndSchema.NAME) public class EntityWithDefaultCatalogAndSchema { diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/ElementCollectionResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/ElementCollectionResource.java index 04d9e1d2c133e..a74cdc6dce768 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/ElementCollectionResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/ElementCollectionResource.java @@ -3,14 +3,14 @@ import java.time.DayOfWeek; import java.time.LocalTime; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/element-collection") @ApplicationScoped diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/OpeningTimes.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/OpeningTimes.java index c75a75fbc7353..e4351539b54c2 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/OpeningTimes.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/elementcollection/OpeningTimes.java @@ -12,11 +12,11 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.GenericGenerator; @@ -125,4 +125,4 @@ public int hashCode() { return Objects.hash( getId(), getName(), getDescription(), getTimeFrom(), getTimeTo(), getDaysOfWeek()); } -} \ No newline at end of file +} diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/CustomEntityListenersAnnotation.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/CustomEntityListenersAnnotation.java index 08e34ff83b24b..c05e1c5bdabea 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/CustomEntityListenersAnnotation.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/CustomEntityListenersAnnotation.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa.entitylistener; -import javax.persistence.EntityListeners; +import jakarta.persistence.EntityListeners; @EntityListeners(MyListenerRequiringCdi.class) public @interface CustomEntityListenersAnnotation { diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityListenerResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityListenerResource.java index 0a5f2066b2f9b..9e0484c14883b 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityListenerResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityListenerResource.java @@ -6,21 +6,21 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.ListAssert; diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughEntityListenersAnnotation.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughEntityListenersAnnotation.java index a90ef7eb85554..588598015506b 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughEntityListenersAnnotation.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughEntityListenersAnnotation.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.entitylistener; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Id; @Entity @EntityListeners(MyListenerRequiringCdi.class) diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughInstanceMethods.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughInstanceMethods.java index 744c3d5c0e57e..d56b9dc08b098 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughInstanceMethods.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/EntityWithListenerThroughInstanceMethods.java @@ -2,15 +2,15 @@ import java.lang.annotation.Annotation; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; @Entity public class EntityWithListenerThroughInstanceMethods { diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyCdiContext.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyCdiContext.java index e10d0a1a0ddb6..274b07e28637e 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyCdiContext.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyCdiContext.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MyCdiContext { diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyListenerRequiringCdi.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyListenerRequiringCdi.java index 141474b3fad00..939d3ccbcf6f3 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyListenerRequiringCdi.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/entitylistener/MyListenerRequiringCdi.java @@ -3,15 +3,15 @@ import java.lang.annotation.Annotation; import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; import io.quarkus.arc.ClientProxy; diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/integrator/IntegratorResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/integrator/IntegratorResource.java index 3490993b608b1..5cfbc191ece4f 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/integrator/IntegratorResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/integrator/IntegratorResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.jpa.integrator; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/integrator") @ApplicationScoped diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java index 6426d90e3552f..ce2e938399b7b 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.jdbcmetadata; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; @@ -30,4 +30,4 @@ public String getName() { public void setName(String name) { this.name = name; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java index 533c99cb10395..a6b0f56822e0d 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.jpa.jdbcmetadata; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/jdbc-metadata-retrieval") @ApplicationScoped diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Child.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Child.java index 8a6853f9614b5..570da8b9ae80a 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Child.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Child.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa.orderbyfragment; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Child { @@ -49,4 +49,4 @@ public void setFavoritePet(String favoritePet) { this.favoritePet = favoritePet; } -} \ No newline at end of file +} diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Parent.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Parent.java index e69aaa7eff656..c8930a8ecfe55 100644 --- a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Parent.java +++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/orderbyfragment/Parent.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; @Entity public class Parent { @@ -33,4 +33,4 @@ public void setId(Long id) { this.id = id; } -} \ No newline at end of file +} diff --git a/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnField.java b/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnField.java index 9e7aef15ad725..ca13e2f3de83e 100644 --- a/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnField.java +++ b/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnField.java @@ -2,14 +2,14 @@ import java.lang.reflect.Type; -import javax.json.bind.annotation.JsonbTypeDeserializer; -import javax.json.bind.annotation.JsonbTypeSerializer; -import javax.json.bind.serializer.DeserializationContext; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.bind.serializer.JsonbSerializer; -import javax.json.bind.serializer.SerializationContext; -import javax.json.stream.JsonGenerator; -import javax.json.stream.JsonParser; +import jakarta.json.bind.annotation.JsonbTypeDeserializer; +import jakarta.json.bind.annotation.JsonbTypeSerializer; +import jakarta.json.bind.serializer.DeserializationContext; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.bind.serializer.JsonbSerializer; +import jakarta.json.bind.serializer.SerializationContext; +import jakarta.json.stream.JsonGenerator; +import jakarta.json.stream.JsonParser; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerDeserializerOnFieldResource.java b/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerDeserializerOnFieldResource.java index ec7f0ffc1bfd6..c400dc1f3c349 100644 --- a/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerDeserializerOnFieldResource.java +++ b/integration-tests/jsonb/src/main/java/io/quarkus/it/jsonb/ModelWithSerializerDeserializerOnFieldResource.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.json.bind.Jsonb; -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.json.bind.Jsonb; +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; @Path("fieldserder") public class ModelWithSerializerDeserializerOnFieldResource { diff --git a/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/JsonInStaticBlockTestCase.java b/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/JsonInStaticBlockTestCase.java index 94471081d26f7..fe0b7aa06370c 100644 --- a/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/JsonInStaticBlockTestCase.java +++ b/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/JsonInStaticBlockTestCase.java @@ -1,6 +1,6 @@ package io.quarkus.it.jsonb; -import javax.json.bind.spi.JsonbProvider; +import jakarta.json.bind.spi.JsonbProvider; import org.junit.jupiter.api.Test; @@ -16,4 +16,4 @@ class JsonInStaticBlockTestCase { void get() { } -} \ No newline at end of file +} diff --git a/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceTest.java b/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceTest.java index 05856fd416733..16f450a2c6418 100644 --- a/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceTest.java +++ b/integration-tests/jsonb/src/test/java/io/quarkus/it/jsonb/ModelWithSerializerAndDeserializerOnFieldResourceTest.java @@ -6,8 +6,8 @@ import java.io.IOException; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; import org.junit.jupiter.api.Test; diff --git a/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java b/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java index 1960ffe1df280..fc8148471aafa 100644 --- a/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java +++ b/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java @@ -2,10 +2,10 @@ import java.time.Duration; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; diff --git a/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java b/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java index 8b7fc9bc2300b..bea7b82aee3f8 100644 --- a/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java +++ b/integration-tests/kafka-avro-apicurio2/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java @@ -4,7 +4,7 @@ import java.util.Properties; import java.util.UUID; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; diff --git a/integration-tests/kafka-avro-apicurio2/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java b/integration-tests/kafka-avro-apicurio2/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java index 7aaeea67e39aa..4884d56422afe 100644 --- a/integration-tests/kafka-avro-apicurio2/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java +++ b/integration-tests/kafka-avro-apicurio2/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.it.kafka.avro.AvroKafkaCreator; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/kafka-avro/pom.xml b/integration-tests/kafka-avro/pom.xml deleted file mode 100644 index 58c6e3ae90a99..0000000000000 --- a/integration-tests/kafka-avro/pom.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - quarkus-integration-tests-parent - io.quarkus - 999-SNAPSHOT - - 4.0.0 - - quarkus-integration-test-kafka-avro - Quarkus - Integration Tests - Kafka Avro - The Apache Kafka Avro integration tests module - - - 1.2.2.Final - - - - - io.quarkus - quarkus-integration-test-class-transformer - - - io.quarkus - quarkus-integration-test-shared-library - - - - - io.quarkus - quarkus-resteasy - - - io.quarkus - quarkus-resteasy-jackson - - - - - io.quarkus - quarkus-kafka-client - - - - - io.quarkus - quarkus-confluent-registry-avro - - - - - io.quarkus - quarkus-avro - - - - - io.quarkus - quarkus-rest-client - - - - - io.confluent - kafka-avro-serializer - 5.5.0 - - - io.swagger - swagger-core - - - jakarta.xml.bind - jakarta.xml.bind-api - - - jakarta.ws.rs - jakarta.ws.rs-api - - - - jakarta.el - jakarta.el-api - - - - - - io.apicurio - apicurio-registry-utils-serde - ${apicurio.version} - - - io.apicurio - apicurio-registry-client - - - org.jboss.spec.javax.interceptor - jboss-interceptors-api_1.2_spec - - - jakarta.activation - jakarta.activation-api - - - com.worldturner.medeia - medeia-validator-jackson - - - - - io.apicurio - apicurio-registry-client - ${apicurio.version} - - - org.jboss.spec.javax.interceptor - jboss-interceptors-api_1.2_spec - - - jakarta.activation - jakarta.activation-api - - - com.worldturner.medeia - medeia-validator-jackson - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - - - - - - com.google.guava - guava - 31.1-jre - - - org.checkerframework - checker-qual - - - - - - - io.quarkus - quarkus-test-kafka-companion - test - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - jakarta.xml.bind - jakarta.xml.bind-api - - - - - io.strimzi - strimzi-test-container - test - - - org.testcontainers - testcontainers - test - - - - - io.quarkus - quarkus-avro-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-integration-test-class-transformer-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-kafka-client-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-confluent-registry-avro-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-rest-client-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-resteasy-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-resteasy-jackson-deployment - ${project.version} - pom - test - - - * - * - - - - - - - - confluent - https://packages.confluent.io/maven/ - - false - - - - - - - - io.quarkus - quarkus-maven-plugin - - - - generate-code - build - - - - - - - maven-failsafe-plugin - - true - - - - - maven-surefire-plugin - - true - - - - - - - - test-kafka - - - test-containers - - - - - - maven-surefire-plugin - - false - - - - maven-failsafe-plugin - - false - - - - - - - - diff --git a/integration-tests/kafka-avro/src/main/avro/pet.avsc b/integration-tests/kafka-avro/src/main/avro/pet.avsc deleted file mode 100644 index ab16e83ff438c..0000000000000 --- a/integration-tests/kafka-avro/src/main/avro/pet.avsc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "namespace": "io.quarkus.it.kafka.avro", - "type": "record", - "name": "Pet", - "fields": [ - { - "name": "name", - "type": "string" - }, - { - "name": "color", - "type": "string" - } - ] -} \ No newline at end of file diff --git a/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java b/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java deleted file mode 100644 index 1960ffe1df280..0000000000000 --- a/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.quarkus.it.kafka.avro; - -import java.time.Duration; - -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; - -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; - -import io.vertx.core.json.JsonObject; - -/** - * Endpoint to test the Avro support - */ -@Path("/avro") -public class AvroEndpoint { - - @Inject - AvroKafkaCreator creator; - - @GET - @Path("/confluent") - public JsonObject getConfluent() { - return get(creator.createConfluentConsumer("test-avro-confluent-consumer", "test-avro-confluent-consumer")); - } - - @POST - @Path("/confluent") - public void sendConfluent(Pet pet) { - KafkaProducer p = creator.createConfluentProducer("test-avro-confluent"); - send(p, pet, "test-avro-confluent-producer"); - } - - @GET - @Path("/apicurio") - public JsonObject getApicurio() { - return get(creator.createApicurioConsumer("test-avro-apicurio-consumer", "test-avro-apicurio-consumer")); - } - - @POST - @Path("/apicurio") - public void sendApicurio(Pet pet) { - KafkaProducer p = creator.createApicurioProducer("test-avro-apicurio"); - send(p, pet, "test-avro-apicurio-producer"); - } - - private JsonObject get(KafkaConsumer consumer) { - final ConsumerRecords records = consumer.poll(Duration.ofMillis(60000)); - if (records.isEmpty()) { - return null; - } - ConsumerRecord consumerRecord = records.iterator().next(); - Pet p = consumerRecord.value(); - // We cannot serialize the returned Pet directly, it contains non-serializable object such as the schema. - JsonObject result = new JsonObject(); - result.put("name", p.getName()); - result.put("color", p.getColor()); - return result; - } - - private void send(KafkaProducer producer, Pet pet, String topic) { - producer.send(new ProducerRecord<>(topic, 0, pet)); - producer.flush(); - } -} diff --git a/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java b/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java deleted file mode 100644 index 2a6e9d809378d..0000000000000 --- a/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroKafkaCreator.java +++ /dev/null @@ -1,154 +0,0 @@ -package io.quarkus.it.kafka.avro; - -import java.util.Collections; -import java.util.Properties; -import java.util.UUID; - -import javax.enterprise.context.ApplicationScoped; - -import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.common.serialization.IntegerDeserializer; -import org.apache.kafka.common.serialization.IntegerSerializer; -import org.eclipse.microprofile.config.inject.ConfigProperty; - -import io.apicurio.registry.utils.serde.AbstractKafkaSerDe; -import io.apicurio.registry.utils.serde.AbstractKafkaSerializer; -import io.apicurio.registry.utils.serde.AvroKafkaDeserializer; -import io.apicurio.registry.utils.serde.AvroKafkaSerializer; -import io.apicurio.registry.utils.serde.avro.AvroDatumProvider; -import io.apicurio.registry.utils.serde.avro.DefaultAvroDatumProvider; -import io.apicurio.registry.utils.serde.strategy.GetOrCreateIdStrategy; -import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig; -import io.confluent.kafka.serializers.KafkaAvroDeserializer; -import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig; -import io.confluent.kafka.serializers.KafkaAvroSerializer; - -/** - * Create Avro Kafka Consumers and Producers - */ -@ApplicationScoped -public class AvroKafkaCreator { - - @ConfigProperty(name = "kafka.bootstrap.servers") - String bootstrap; - @ConfigProperty(name = "schema.url.confluent") - String confluent; - @ConfigProperty(name = "schema.url.apicurio") - String apicurio; - - public KafkaConsumer createConfluentConsumer(String groupdIdConfig, String subscribtionName) { - return createConfluentConsumer(bootstrap, confluent, groupdIdConfig, subscribtionName); - } - - public KafkaProducer createConfluentProducer(String clientId) { - return createConfluentProducer(bootstrap, confluent, clientId); - } - - public KafkaConsumer createApicurioConsumer(String groupdIdConfig, String subscribtionName) { - return createApicurioConsumer(bootstrap, apicurio, groupdIdConfig, subscribtionName); - } - - public KafkaProducer createApicurioProducer(String clientId) { - return createApicurioProducer(bootstrap, apicurio, clientId); - } - - public static KafkaConsumer createConfluentConsumer(String bootstrap, String confluent, - String groupdIdConfig, String subscribtionName) { - Properties p = getConfluentConsumerProperties(bootstrap, confluent, groupdIdConfig); - return createConsumer(p, subscribtionName); - } - - public static KafkaConsumer createApicurioConsumer(String bootstrap, String apicurio, - String groupdIdConfig, String subscribtionName) { - Properties p = getApicurioConsumerProperties(bootstrap, apicurio, groupdIdConfig); - return createConsumer(p, subscribtionName); - } - - public static KafkaProducer createConfluentProducer(String bootstrap, String confluent, - String clientId) { - Properties p = getConfluentProducerProperties(bootstrap, confluent, clientId); - return createProducer(p); - } - - public static KafkaProducer createApicurioProducer(String bootstrap, String apicurio, - String clientId) { - Properties p = getApicurioProducerProperties(bootstrap, apicurio, clientId); - return createProducer(p); - } - - private static KafkaConsumer createConsumer(Properties props, String subscribtionName) { - if (!props.containsKey(ConsumerConfig.CLIENT_ID_CONFIG)) { - props.put(ConsumerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()); - } - KafkaConsumer consumer = new KafkaConsumer<>(props); - consumer.subscribe(Collections.singletonList(subscribtionName)); - return consumer; - } - - private static KafkaProducer createProducer(Properties props) { - if (!props.containsKey(ProducerConfig.CLIENT_ID_CONFIG)) { - props.put(ProducerConfig.CLIENT_ID_CONFIG, UUID.randomUUID().toString()); - } - return new KafkaProducer<>(props); - } - - private static Properties getConfluentConsumerProperties(String bootstrap, String confluent, - String groupdIdConfig) { - Properties props = getGenericConsumerProperties(bootstrap, groupdIdConfig); - props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, KafkaAvroDeserializer.class.getName()); - props.put(AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, confluent); - props.put(KafkaAvroDeserializerConfig.SPECIFIC_AVRO_READER_CONFIG, true); - return props; - } - - public static Properties getApicurioConsumerProperties(String bootstrap, String apicurio, String groupdIdConfig) { - Properties props = getGenericConsumerProperties(bootstrap, groupdIdConfig); - props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, AvroKafkaDeserializer.class.getName()); - props.put(AbstractKafkaSerDe.REGISTRY_URL_CONFIG_PARAM, apicurio); - // this is a workaround for Apicurio Registry 1.2.2.Final bug: if `avro-datum-provider` - // isn't set to `DefaultAvroDatumProvider` explicitly, `use-specific-avro-reader` isn't processed - props.put(AvroDatumProvider.REGISTRY_AVRO_DATUM_PROVIDER_CONFIG_PARAM, - DefaultAvroDatumProvider.class.getName()); - props.put(AvroDatumProvider.REGISTRY_USE_SPECIFIC_AVRO_READER_CONFIG_PARAM, true); - return props; - } - - private static Properties getGenericConsumerProperties(String bootstrap, String groupdIdConfig) { - Properties props = new Properties(); - props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrap); - props.put(ConsumerConfig.GROUP_ID_CONFIG, groupdIdConfig); - props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, IntegerDeserializer.class.getName()); - props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true"); - props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); - props.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, "1000"); - return props; - } - - private static Properties getConfluentProducerProperties(String bootstrap, String confluent, String clientId) { - Properties props = getGenericProducerProperties(bootstrap, clientId); - props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, KafkaAvroSerializer.class.getName()); - props.put(AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, confluent); - return props; - } - - private static Properties getApicurioProducerProperties(String bootstrap, String apicurio, String clientId) { - Properties props = getGenericProducerProperties(bootstrap, clientId); - props.put(ProducerConfig.ACKS_CONFIG, "all"); - props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, AvroKafkaSerializer.class.getName()); - props.put(AbstractKafkaSerDe.REGISTRY_URL_CONFIG_PARAM, apicurio); - props.put(AbstractKafkaSerializer.REGISTRY_GLOBAL_ID_STRATEGY_CONFIG_PARAM, - GetOrCreateIdStrategy.class.getName()); - return props; - } - - private static Properties getGenericProducerProperties(String bootstrap, String clientId) { - Properties props = new Properties(); - props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrap); - props.put(ProducerConfig.CLIENT_ID_CONFIG, clientId); - props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, IntegerSerializer.class.getName()); - return props; - } -} diff --git a/integration-tests/kafka-avro/src/main/resources/application.properties b/integration-tests/kafka-avro/src/main/resources/application.properties deleted file mode 100644 index c1b0831aa2f29..0000000000000 --- a/integration-tests/kafka-avro/src/main/resources/application.properties +++ /dev/null @@ -1,10 +0,0 @@ -quarkus.log.category.kafka.level=WARN -quarkus.log.category.\"org.apache.kafka\".level=WARN -quarkus.log.category.\"org.apache.zookeeper\".level=WARN - -# enable health check -quarkus.kafka.health.enabled=true - -# using QuarkusTestResourceLifecycleManager in this test -quarkus.kafka.devservices.enabled=false -quarkus.apicurio-registry.devservices.enabled=false diff --git a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/AvroSpecificRecordJacksonSerializationTest.java b/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/AvroSpecificRecordJacksonSerializationTest.java deleted file mode 100644 index 359b2fa7e7bca..0000000000000 --- a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/AvroSpecificRecordJacksonSerializationTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.quarkus.it.kafka; - -import javax.inject.Inject; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.quarkus.it.kafka.avro.Pet; -import io.quarkus.test.junit.QuarkusTest; - -/** - * This test verifies that the Avro classes can be serialized using Jackson. - * By default, they can't as the Avro class contains non-serializable fields. - * - * There is a custom serializer registered explicitly that allow the serialization. - */ -@QuarkusTest -public class AvroSpecificRecordJacksonSerializationTest { - - @Inject - ObjectMapper mapper; - - @Test - void testSerialization() throws JsonProcessingException { - Assertions.assertTrue(mapper.getRegisteredModuleIds().contains("AvroSpecificRecordModule")); - - Pet pet = new Pet("roxanne", "gray"); - String s = mapper.writer().writeValueAsString(pet); - // The serializer preserves the order of the field. - Assertions.assertEquals(s, "{\"name\":\"roxanne\",\"color\":\"gray\"}"); - } - -} diff --git a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java b/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java deleted file mode 100644 index ef247aad563e5..0000000000000 --- a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.quarkus.it.kafka; - -import java.util.HashMap; -import java.util.Map; - -import org.testcontainers.containers.GenericContainer; - -import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; - -public class KafkaAndSchemaRegistryTestResource implements QuarkusTestResourceLifecycleManager { - - private static GenericContainer registry; - - public static String getConfluentSchemaRegistryUrl() { - return "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api/ccompat"; - } - - public static String getApicurioSchemaRegistryUrl() { - return "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api"; - } - - @Override - public Map start() { - registry = new GenericContainer<>("apicurio/apicurio-registry-mem:1.2.2.Final") - .withExposedPorts(8080) - .withEnv("QUARKUS_PROFILE", "prod"); - registry.start(); - Map properties = new HashMap<>(); - properties.put("schema.url.confluent", - "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api/ccompat"); - properties.put("schema.url.apicurio", - "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api"); - return properties; - } - - @Override - public void stop() { - registry.stop(); - } -} diff --git a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAvroIT.java b/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAvroIT.java deleted file mode 100644 index 4a2f287947a0c..0000000000000 --- a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAvroIT.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.quarkus.it.kafka; - -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -@QuarkusTestResource(KafkaAndSchemaRegistryTestResource.class) -public class KafkaAvroIT extends KafkaAvroTest { - -} diff --git a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java b/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java deleted file mode 100644 index 521e62fe06a76..0000000000000 --- a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAvroTest.java +++ /dev/null @@ -1,137 +0,0 @@ -package io.quarkus.it.kafka; - -import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG; -import static io.confluent.kafka.serializers.KafkaAvroDeserializerConfig.SPECIFIC_AVRO_READER_CONFIG; - -import java.util.Map; - -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.common.serialization.Deserializer; -import org.apache.kafka.common.serialization.Serde; -import org.apache.kafka.common.serialization.Serdes; -import org.apache.kafka.common.serialization.Serializer; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import io.apicurio.registry.utils.serde.AbstractKafkaSerDe; -import io.apicurio.registry.utils.serde.AbstractKafkaSerializer; -import io.apicurio.registry.utils.serde.AvroKafkaDeserializer; -import io.apicurio.registry.utils.serde.AvroKafkaSerializer; -import io.apicurio.registry.utils.serde.avro.AvroDatumProvider; -import io.apicurio.registry.utils.serde.avro.DefaultAvroDatumProvider; -import io.apicurio.registry.utils.serde.strategy.GetOrCreateIdStrategy; -import io.confluent.kafka.serializers.KafkaAvroDeserializer; -import io.confluent.kafka.serializers.KafkaAvroSerializer; -import io.quarkus.it.kafka.avro.Pet; -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.kafka.InjectKafkaCompanion; -import io.quarkus.test.kafka.KafkaCompanionResource; -import io.restassured.RestAssured; -import io.smallrye.reactive.messaging.kafka.companion.ConsumerBuilder; -import io.smallrye.reactive.messaging.kafka.companion.ConsumerTask; -import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion; -import io.smallrye.reactive.messaging.kafka.companion.ProducerBuilder; - -@QuarkusTest -@QuarkusTestResource(KafkaAndSchemaRegistryTestResource.class) -@QuarkusTestResource(KafkaCompanionResource.class) -public class KafkaAvroTest { - - private static final String CONFLUENT_PATH = "/avro/confluent"; - private static final String APICURIO_PATH = "/avro/apicurio"; - - @InjectKafkaCompanion - KafkaCompanion companion; - - @Test - public void testConfluentAvroProducer() { - configureConfluentSerde(); - ConsumerBuilder consumer = companion.consume(Integer.class, Pet.class); - ConsumerTask consumeTask = consumer.withGroupId("test-avro-confluent") - .fromTopics("test-avro-confluent-producer", 1); - testAvroProducer(consumeTask, CONFLUENT_PATH); - } - - @Test - public void testConfluentAvroConsumer() { - configureConfluentSerde(); - ProducerBuilder producer = companion.produce(Integer.class, Pet.class); - producer.withClientId("test-avro-confluent-test"); - testAvroConsumer(producer, CONFLUENT_PATH, "test-avro-confluent-consumer"); - } - - @Test - public void testApicurioAvroProducer() { - configureApicurioSerde(); - ConsumerBuilder consumer = companion.consume(Integer.class, Pet.class); - ConsumerTask consumeTask = consumer.withGroupId("test-avro-apicurio") - .fromTopics("test-avro-apicurio-producer", 1); - testAvroProducer(consumeTask, APICURIO_PATH); - } - - @Test - public void testApicurioAvroConsumer() { - configureApicurioSerde(); - ProducerBuilder producer = companion.produce(Integer.class, Pet.class); - producer.withClientId("test-avro-apicurio-test") - .withProp(ProducerConfig.ACKS_CONFIG, "all"); - testAvroConsumer(producer, APICURIO_PATH, "test-avro-apicurio-consumer"); - } - - private void testAvroProducer(ConsumerTask consumeTask, String path) { - RestAssured.given() - .header("content-type", "application/json") - .body("{\"name\":\"neo\", \"color\":\"tricolor\"}") - .post(path); - ConsumerRecord records = consumeTask.awaitCompletion().getFirstRecord(); - Assertions.assertEquals(records.key(), (Integer) 0); - Pet pet = records.value(); - Assertions.assertEquals("neo", pet.getName()); - Assertions.assertEquals("tricolor", pet.getColor()); - } - - private void testAvroConsumer(ProducerBuilder producer, String path, String topic) { - producer.fromRecords(new ProducerRecord<>(topic, 1, createPet())).awaitCompletion(); - Pet retrieved = RestAssured.when().get(path).as(Pet.class); - Assertions.assertEquals("neo", retrieved.getName()); - Assertions.assertEquals("white", retrieved.getColor()); - } - - private Pet createPet() { - Pet pet = new Pet(); - pet.setName("neo"); - pet.setColor("white"); - return pet; - } - - private void configureConfluentSerde() { - Serde petSerde = serdeFrom(new KafkaAvroSerializer(), new KafkaAvroDeserializer()); - petSerde.configure(Map.of( - SCHEMA_REGISTRY_URL_CONFIG, KafkaAndSchemaRegistryTestResource.getConfluentSchemaRegistryUrl(), - SPECIFIC_AVRO_READER_CONFIG, "true"), false); - companion.registerSerde(Pet.class, petSerde); - } - - private void configureApicurioSerde() { - Serde petSerde = Serdes.serdeFrom(new AvroKafkaSerializer<>(), new AvroKafkaDeserializer<>()); - petSerde.configure(Map.of( - AbstractKafkaSerDe.REGISTRY_URL_CONFIG_PARAM, KafkaAndSchemaRegistryTestResource.getApicurioSchemaRegistryUrl(), - // procuder - // this is a workaround for Apicurio Registry 1.2.2.Final bug: if `avro-datum-provider` - // isn't set to `DefaultAvroDatumProvider` explicitly, `use-specific-avro-reader` isn't processed - AvroDatumProvider.REGISTRY_USE_SPECIFIC_AVRO_READER_CONFIG_PARAM, "true", - AvroDatumProvider.REGISTRY_AVRO_DATUM_PROVIDER_CONFIG_PARAM, DefaultAvroDatumProvider.class.getName(), - // consumer - AbstractKafkaSerializer.REGISTRY_GLOBAL_ID_STRATEGY_CONFIG_PARAM, GetOrCreateIdStrategy.class.getName()), - false); - companion.registerSerde(Pet.class, petSerde); - } - - @SuppressWarnings({ "rawtypes" }) - Serde serdeFrom(Serializer serializer, Deserializer deserializer) { - return (Serde) Serdes.serdeFrom(serializer, deserializer); - } -} diff --git a/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaAdminManager.java b/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaAdminManager.java index 7ac165238105c..4646a438c80b9 100644 --- a/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaAdminManager.java +++ b/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaAdminManager.java @@ -7,9 +7,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.admin.AdminClientConfig; diff --git a/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java index 00b0c740d5e69..cf294ebd949b0 100644 --- a/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java +++ b/integration-tests/kafka-devservices/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.it.kafka; -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; @Path("/kafka") public class KafkaEndpoint { diff --git a/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java b/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java index 28c8ab686c947..191cdf8cd8ca0 100644 --- a/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java +++ b/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java b/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java index 08676d4c4025c..f8ccd7c191d05 100644 --- a/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java +++ b/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka.sasl; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.java b/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.java index 0b5a93284bf1a..c80264f17936d 100644 --- a/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.java +++ b/integration-tests/kafka-oauth-keycloak/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.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; @Path("/kafka") public class KafkaResource { @@ -19,4 +19,4 @@ public class KafkaResource { public List getValues() { return consumer.getValues(); } -} \ No newline at end of file +} diff --git a/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java b/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java index 28c8ab686c947..191cdf8cd8ca0 100644 --- a/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java +++ b/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaConsumer.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java b/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java index 08676d4c4025c..f8ccd7c191d05 100644 --- a/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java +++ b/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka.sasl; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.java b/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.java index 0b5a93284bf1a..c80264f17936d 100644 --- a/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.java +++ b/integration-tests/kafka-sasl-elytron/src/main/java/io/quarkus/it/kafka/sasl/KafkaResource.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; @Path("/kafka") public class KafkaResource { @@ -19,4 +19,4 @@ public class KafkaResource { public List getValues() { return consumer.getValues(); } -} \ No newline at end of file +} diff --git a/integration-tests/kafka-sasl/src/main/java/io/quarkus/it/kafka/sasl/SaslKafkaEndpoint.java b/integration-tests/kafka-sasl/src/main/java/io/quarkus/it/kafka/sasl/SaslKafkaEndpoint.java index 1b06fefe8b387..bcfb816d7ae13 100644 --- a/integration-tests/kafka-sasl/src/main/java/io/quarkus/it/kafka/sasl/SaslKafkaEndpoint.java +++ b/integration-tests/kafka-sasl/src/main/java/io/quarkus/it/kafka/sasl/SaslKafkaEndpoint.java @@ -4,10 +4,10 @@ import java.util.Collections; import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.Consumer; diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java index d8c0303af163b..46fccf49140ee 100644 --- a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java +++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java @@ -4,11 +4,11 @@ import java.util.Collections; import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java index fd429d6fcd109..9020ceaa0b7d8 100644 --- a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java +++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.it.kafka; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/kafka") public class KafkaEndpoint { diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java index e1d61b1117dd4..41f0fd23563c4 100644 --- a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java +++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java @@ -2,11 +2,11 @@ import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java index 2d5abbeb43db2..4aa610363f183 100644 --- a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java +++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java @@ -4,10 +4,10 @@ import java.util.Collections; import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/integration-tests/kafka-ssl/src/main/java/io/quarkus/it/kafka/ssl/SslKafkaEndpoint.java b/integration-tests/kafka-ssl/src/main/java/io/quarkus/it/kafka/ssl/SslKafkaEndpoint.java index c424e779f8293..773fd8681bb51 100644 --- a/integration-tests/kafka-ssl/src/main/java/io/quarkus/it/kafka/ssl/SslKafkaEndpoint.java +++ b/integration-tests/kafka-ssl/src/main/java/io/quarkus/it/kafka/ssl/SslKafkaEndpoint.java @@ -5,10 +5,10 @@ import java.util.Collections; import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.consumer.Consumer; diff --git a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java index 496a7329eefdb..38e5fbac605cd 100644 --- a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java +++ b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java @@ -1,11 +1,11 @@ package io.quarkus.it.kafka.streams; -import javax.enterprise.context.ApplicationScoped; -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 jakarta.enterprise.context.ApplicationScoped; +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 org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.StoreQueryParameters; diff --git a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java index 6f312fde0fc9b..e7affadc599dd 100644 --- a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java +++ b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.LongAdder; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.apache.kafka.streams.KafkaStreams; diff --git a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsPipeline.java b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsPipeline.java index 9e1cbc002c452..ed932cb7a1771 100644 --- a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsPipeline.java +++ b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsPipeline.java @@ -1,8 +1,8 @@ package io.quarkus.it.kafka.streams; -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.streams.KafkaStreams.State; diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java index 9600d651d60f0..8c7fffe1ff5b4 100644 --- a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java +++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka.streams; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsPropertiesTest.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsPropertiesTest.java index cb2f1550cbe13..8a56018dbeedb 100644 --- a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsPropertiesTest.java +++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsPropertiesTest.java @@ -3,7 +3,7 @@ import java.lang.reflect.Field; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.streams.KafkaStreams; diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java index 0f1fba2676d22..a68acba849e55 100644 --- a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java +++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.http.HttpStatus; import org.apache.kafka.streams.KafkaStreams; diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java index 3715bbd5df4ea..991af1eb4e430 100644 --- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java +++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java @@ -4,11 +4,11 @@ import java.util.Collections; import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java index fd429d6fcd109..9020ceaa0b7d8 100644 --- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java +++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java @@ -1,9 +1,9 @@ package io.quarkus.it.kafka; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/kafka") public class KafkaEndpoint { diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java index b25e0b4822a7b..f41c832aab862 100644 --- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java +++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java @@ -2,11 +2,11 @@ import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Event; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.Producer; diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java index 904b0c028eac0..77d64269d6e4a 100644 --- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java +++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java @@ -5,10 +5,10 @@ import java.util.List; import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/AdminClientResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/AdminClientResource.java index fa99da14b2a70..d5b379df18b34 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/AdminClientResource.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/AdminClientResource.java @@ -4,11 +4,11 @@ import java.util.Arrays; 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.config.inject.ConfigProperty; import org.keycloak.admin.client.Keycloak; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java index ccf7348b98213..7252dc38ca0d9 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index b79d66aa16b4d..98e033b2f14ae 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -5,15 +5,16 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; import javax.security.auth.AuthPermission; -import javax.ws.rs.ForbiddenException; -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.Context; + +import jakarta.inject.Inject; +import jakarta.ws.rs.ForbiddenException; +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.Context; import org.keycloak.authorization.client.AuthzClient; import org.keycloak.representations.idm.authorization.Permission; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java index ea5e91e9d4a26..04e782c18cd60 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -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; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedTenantResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedTenantResource.java index 8a59bee71de7e..02fba91c885e3 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedTenantResource.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedTenantResource.java @@ -2,11 +2,12 @@ import java.util.List; -import javax.inject.Inject; import javax.security.auth.AuthPermission; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; + +import jakarta.inject.Inject; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.keycloak.representations.idm.authorization.Permission; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedWebAppTenantResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedWebAppTenantResource.java index 4af71b4da7fef..c69579906e33b 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedWebAppTenantResource.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedWebAppTenantResource.java @@ -2,11 +2,12 @@ import java.util.List; -import javax.inject.Inject; import javax.security.auth.AuthPermission; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; + +import jakarta.inject.Inject; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.keycloak.representations.idm.authorization.Permission; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/PublicResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/PublicResource.java index 2398c8b152da8..ba90d1c1ff618 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/PublicResource.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/PublicResource.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/api") public class PublicResource { diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/SnakeCaseObjectMapperCustomizer.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/SnakeCaseObjectMapperCustomizer.java index 56f297f6d39ef..89d5496cfdda0 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/SnakeCaseObjectMapperCustomizer.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/SnakeCaseObjectMapperCustomizer.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java index 9ac559a75da9a..59bd33c1d65c4 100644 --- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java +++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java @@ -3,9 +3,9 @@ import java.lang.reflect.Type; import java.util.function.BiFunction; -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 com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; diff --git a/integration-tests/kotlin-serialization/pom.xml b/integration-tests/kotlin-serialization/pom.xml index f1e96d4b05990..90395ea5a01ff 100644 --- a/integration-tests/kotlin-serialization/pom.xml +++ b/integration-tests/kotlin-serialization/pom.xml @@ -115,7 +115,7 @@ kotlinx-serialization - + diff --git a/integration-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt b/integration-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt index 9340add0ca808..5e7bf549507f3 100644 --- a/integration-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt +++ b/integration-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt @@ -3,16 +3,16 @@ package io.quarkus.it.kotser import io.quarkus.it.kotser.model.Person import io.quarkus.it.kotser.model.Person2 import io.quarkus.runtime.annotations.RegisterForReflection +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 jakarta.ws.rs.core.Response import kotlinx.coroutines.flow.flowOf import org.jboss.resteasy.reactive.RestResponse import java.lang.reflect.Method -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 javax.ws.rs.core.Response import kotlin.reflect.jvm.javaMethod @Path("/") diff --git a/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt b/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt index b08196a95935d..a9a19e4a701b5 100644 --- a/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt +++ b/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt @@ -5,10 +5,10 @@ import io.restassured.http.ContentType.JSON import io.restassured.module.kotlin.extensions.Given import io.restassured.module.kotlin.extensions.Then import io.restassured.module.kotlin.extensions.When +import jakarta.ws.rs.core.MediaType import org.hamcrest.CoreMatchers import org.hamcrest.CoreMatchers.`is` import org.junit.jupiter.api.Test -import javax.ws.rs.core.MediaType @QuarkusTest open class ResourceTest { diff --git a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml index 6b45fd12bfcfe..9d7b96435010b 100644 --- a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml +++ b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml @@ -93,8 +93,8 @@ - - + + diff --git a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/GreetingService.kt b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/GreetingService.kt index d2ef3f867a58f..702331c77d88a 100644 --- a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/GreetingService.kt +++ b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/GreetingService.kt @@ -1,6 +1,6 @@ package org.acme -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class GreetingService { diff --git a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/HelloResource.kt b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/HelloResource.kt index 0f4ca19358ce1..35f950229f96a 100644 --- a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/HelloResource.kt +++ b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/HelloResource.kt @@ -2,11 +2,11 @@ package org.acme import org.eclipse.microprofile.config.inject.ConfigProperty -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("/hello") class HelloResource(val greetingService: GreetingService) { diff --git a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/MyApplication.kt b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/MyApplication.kt index a671aa1108991..d4a8377085192 100644 --- a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/MyApplication.kt +++ b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/src/main/kotlin/org/acme/MyApplication.kt @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.ApplicationPath -import javax.ws.rs.core.Application +import jakarta.ws.rs.ApplicationPath +import jakarta.ws.rs.core.Application @ApplicationPath("/app") class MyApplication : Application() diff --git a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml index e40cb6e219594..a5cc869a832c5 100644 --- a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml +++ b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/pom.xml @@ -80,8 +80,8 @@ - - + + diff --git a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/src/main/kotlin/org/acme/GreetingResource.kt b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/src/main/kotlin/org/acme/GreetingResource.kt index 8d765a9226dfb..f40301d7bd443 100644 --- a/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/src/main/kotlin/org/acme/GreetingResource.kt +++ b/integration-tests/kotlin/src/test/resources/projects/external-reloadable-artifacts/app/src/main/kotlin/org/acme/GreetingResource.kt @@ -1,9 +1,9 @@ package org.acme -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.acme.lib.* diff --git a/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml b/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml index 11ccee8b43bdf..eb816331807ff 100644 --- a/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml +++ b/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/pom.xml @@ -107,8 +107,8 @@ - - + + -Xemit-jvm-type-annotations diff --git a/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/src/main/kotlin/org/acme/HelloResource.kt b/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/src/main/kotlin/org/acme/HelloResource.kt index 12e57cdba4951..3bd594ec808ca 100644 --- a/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/src/main/kotlin/org/acme/HelloResource.kt +++ b/integration-tests/kotlin/src/test/resources/projects/kotlin-compiler-args/src/main/kotlin/org/acme/HelloResource.kt @@ -1,10 +1,10 @@ package org.acme -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("/app/hello") class HelloResource() { diff --git a/integration-tests/kubernetes-client-devservices/src/test/java/io/quarkus/kubernetes/client/devservices/it/DevServicesKubernetesITest.java b/integration-tests/kubernetes-client-devservices/src/test/java/io/quarkus/kubernetes/client/devservices/it/DevServicesKubernetesITest.java index a30211e97fa92..bee85cf7445cb 100644 --- a/integration-tests/kubernetes-client-devservices/src/test/java/io/quarkus/kubernetes/client/devservices/it/DevServicesKubernetesITest.java +++ b/integration-tests/kubernetes-client-devservices/src/test/java/io/quarkus/kubernetes/client/devservices/it/DevServicesKubernetesITest.java @@ -1,6 +1,6 @@ package io.quarkus.kubernetes.client.devservices.it; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/ConfigMapProperties.java b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/ConfigMapProperties.java index e749ab3cee603..4cac351326bb6 100644 --- a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/ConfigMapProperties.java +++ b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/ConfigMapProperties.java @@ -1,7 +1,7 @@ package io.quarkus.it.kubernetes.client; -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/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java index 635ee4eabeac4..de54905a37ca6 100644 --- a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java +++ b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.UUID; -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.core.Response; +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.core.Response; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; diff --git a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java index a879c97f939d8..de81f578940c5 100644 --- a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java +++ b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java @@ -1,7 +1,7 @@ package io.quarkus.it.kubernetes.client; -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/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Version.java b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Version.java index f77572e86ca21..0bce4bba85ff9 100644 --- a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Version.java +++ b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Version.java @@ -1,8 +1,8 @@ package io.quarkus.it.kubernetes.client; -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.fabric8.kubernetes.client.KubernetesClient; diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/OpenShiftTestServerTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/OpenShiftTestServerTest.java index 7ac81f6b3a813..019b1dc5b24e6 100644 --- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/OpenShiftTestServerTest.java +++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/OpenShiftTestServerTest.java @@ -5,7 +5,7 @@ import java.util.Base64; import java.util.function.Consumer; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java index 9d60a9f3bb8ce..8fd28bbe3d695 100644 --- a/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java +++ b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java @@ -1,13 +1,13 @@ package io.quarkus.it.k8ssb.jdbc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java index d5f663f9deaa9..5a9a9d7a9fa73 100644 --- a/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java +++ b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.smallrye.common.annotation.Blocking; diff --git a/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java b/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java index 9d60a9f3bb8ce..8fd28bbe3d695 100644 --- a/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java +++ b/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java @@ -1,13 +1,13 @@ package io.quarkus.it.k8ssb.jdbc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.QueryHint; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "known_fruits") diff --git a/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java b/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java index bbd649163a981..c6158e87d8277 100644 --- a/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java +++ b/integration-tests/kubernetes-service-binding-reactive/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml b/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml index 5ed5dee82e1c8..1b6ac8e2d05df 100644 --- a/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml +++ b/integration-tests/kubernetes/quarkus-standard-way-kafka/pom.xml @@ -101,8 +101,8 @@ test - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api test diff --git a/integration-tests/kubernetes/quarkus-standard-way/pom.xml b/integration-tests/kubernetes/quarkus-standard-way/pom.xml index db695f26cfe3b..684082bf762d4 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/pom.xml +++ b/integration-tests/kubernetes/quarkus-standard-way/pom.xml @@ -101,8 +101,8 @@ test - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api test diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/main/java/io/quarkus/it/kubernetes/GreetingResource.java b/integration-tests/kubernetes/quarkus-standard-way/src/main/java/io/quarkus/it/kubernetes/GreetingResource.java index 9969525540057..83474042031c3 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/main/java/io/quarkus/it/kubernetes/GreetingResource.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/main/java/io/quarkus/it/kubernetes/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.kubernetes; -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/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java index ad80766a17747..95b11f63bda44 100644 --- a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java +++ b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/src/main/java/org/acme/Hello.java @@ -1,9 +1,9 @@ package org.acme; -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 Hello { @@ -13,4 +13,4 @@ public class Hello { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java index cdbb0a4efc69c..f056bd62adf53 100644 --- a/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java +++ b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java @@ -2,12 +2,12 @@ import java.util.List; -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.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.bson.types.ObjectId; diff --git a/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java b/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java index 6f9a203d3ec4f..f87033d050171 100644 --- a/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java +++ b/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.bson.Document; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseApp.java b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseApp.java index 2225995da32ca..6cc6f48b9245b 100644 --- a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseApp.java +++ b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseApp.java @@ -1,7 +1,7 @@ package io.quarkus.it.liquibase; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/liquibase") public class LiquibaseApp extends Application { diff --git a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java index 4c09bbc46f0a4..b71310c69e38c 100644 --- a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java +++ b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java @@ -4,10 +4,10 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import io.quarkus.liquibase.LiquibaseFactory; import liquibase.Liquibase; diff --git a/integration-tests/locales/src/main/java/io/quarkus/locales/it/LocalesResource.java b/integration-tests/locales/src/main/java/io/quarkus/locales/it/LocalesResource.java index c4998b33c5016..ad2ff844decb3 100644 --- a/integration-tests/locales/src/main/java/io/quarkus/locales/it/LocalesResource.java +++ b/integration-tests/locales/src/main/java/io/quarkus/locales/it/LocalesResource.java @@ -5,12 +5,12 @@ import java.util.Locale; import java.util.TimeZone; -import javax.validation.constraints.NotNull; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; @Path("") public class LocalesResource { diff --git a/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java b/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java index 28cba380916e0..6de56f46342f9 100644 --- a/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java +++ b/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java @@ -16,9 +16,9 @@ */ package io.quarkus.logging.gelf.it; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.logging.Logger; diff --git a/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java b/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java index 1c3099e4d5610..b83cf4d4c0026 100644 --- a/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java +++ b/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java @@ -2,10 +2,10 @@ import java.util.logging.Logger; -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 GreetingResource { diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java index 7e8b33db36039..8ac43dd4f6f8a 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.above; -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; diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java index b2597bf482b9c..b57ffc92fbda3 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.below; -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; diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java index e17b1267e0ae1..184ae23f8f1a8 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.below.child; -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; diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java index e4055c810b6c2..1ccf19909feb6 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.bydefault; -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; diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/filter/LoggingFilter.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/filter/LoggingFilter.java index 4410b4cdd7ee6..59b6dc2e1bf27 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/filter/LoggingFilter.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/filter/LoggingFilter.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.filter; -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; diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java index ddb251b3ee243..26560f81fe606 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.promote; -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; diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java index 6c29051a9c190..75d229cd4e1ab 100644 --- a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java +++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.set.promote.sub; -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; diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java index f2982156233e5..1102ce2f82cb9 100644 --- a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java +++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.unset.above; -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; diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java index 0a6c206c6f067..289780abedb1d 100644 --- a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java +++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.unset.bydefault; -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; diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java index 4bc35d2dc7cd9..f306a7ecf93d0 100644 --- a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java +++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java @@ -1,9 +1,9 @@ package io.quarkus.it.logging.minlevel.unset.promote; -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; diff --git a/integration-tests/logging-panache-kotlin/pom.xml b/integration-tests/logging-panache-kotlin/pom.xml index 24faafa687ef2..f689140cd745f 100644 --- a/integration-tests/logging-panache-kotlin/pom.xml +++ b/integration-tests/logging-panache-kotlin/pom.xml @@ -111,7 +111,7 @@ all-open - + diff --git a/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingEntity.kt b/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingEntity.kt index 97ba927822c25..ab7c0fe34512f 100644 --- a/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingEntity.kt +++ b/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingEntity.kt @@ -1,7 +1,7 @@ package io.quarkus.logging import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity -import javax.persistence.Entity +import jakarta.persistence.Entity @Entity open class LoggingEntity : PanacheEntity() { diff --git a/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingRepository.kt b/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingRepository.kt index 0587f5adb2b82..5238eaadef53d 100644 --- a/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingRepository.kt +++ b/integration-tests/logging-panache-kotlin/src/main/kotlin/io/quarkus/logging/LoggingRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.logging import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class LoggingRepository : PanacheRepository { diff --git a/integration-tests/logging-panache-kotlin/src/test/kotlin/io/quarkus/logging/LoggingWithPanacheKotlinTest.java b/integration-tests/logging-panache-kotlin/src/test/kotlin/io/quarkus/logging/LoggingWithPanacheKotlinTest.java index de472982f6b75..a6d48ce81f496 100644 --- a/integration-tests/logging-panache-kotlin/src/test/kotlin/io/quarkus/logging/LoggingWithPanacheKotlinTest.java +++ b/integration-tests/logging-panache-kotlin/src/test/kotlin/io/quarkus/logging/LoggingWithPanacheKotlinTest.java @@ -6,7 +6,7 @@ import java.util.logging.Formatter; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java index f3ddfdd4f0c96..a3bed8f67238f 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java @@ -1,7 +1,7 @@ package io.quarkus.logging; -import javax.annotation.PostConstruct; -import javax.inject.Singleton; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Singleton; @Singleton public class LoggingBean implements LoggingInterface { diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java index 8fe56a9d405dc..6e184412e2f35 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java @@ -1,7 +1,7 @@ package io.quarkus.logging; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/logging") public class LoggingEndpoint { diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEntity.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEntity.java index e59bb0f83eb43..3bda01750fe35 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEntity.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEntity.java @@ -1,6 +1,6 @@ package io.quarkus.logging; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java index 563b5f15b15f6..075b1dec002aa 100644 --- a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java +++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java @@ -6,7 +6,7 @@ import java.util.logging.Formatter; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.logmanager.formatters.PatternFormatter; import org.junit.jupiter.api.Test; diff --git a/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java b/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java index 56f7631d61b67..c831107fc268b 100644 --- a/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java +++ b/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java @@ -3,11 +3,11 @@ import java.io.IOException; import java.time.Duration; -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.mailer.Mail; import io.quarkus.mailer.MailTemplate; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/IntercepredNormalScopedFoo.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/IntercepredNormalScopedFoo.java index d75b2d133603e..d38c7381d5080 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/IntercepredNormalScopedFoo.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/IntercepredNormalScopedFoo.java @@ -1,7 +1,7 @@ package io.quarkus.it.arc; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.arc.Lock; import io.quarkus.arc.Unremovable; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/ProducerOfUnusedUnremovableBean.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/ProducerOfUnusedUnremovableBean.java index 9660e4130df3f..be676facb3656 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/ProducerOfUnusedUnremovableBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/ProducerOfUnusedUnremovableBean.java @@ -1,7 +1,7 @@ package io.quarkus.it.arc; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import io.quarkus.arc.Unremovable; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/ReflectiveBeanEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/ReflectiveBeanEndpoint.java index 5117e65aee1a1..b52866ac0b218 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/ReflectiveBeanEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/ReflectiveBeanEndpoint.java @@ -3,9 +3,9 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -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.arc.ClientProxy; @@ -35,4 +35,4 @@ private int callPingViaReflection(IntercepredNormalScopedFoo foo) throws NoSuchM Method pingMethod = foo.getClass().getDeclaredMethod("ping"); return (int) pingMethod.invoke(foo); } -} \ No newline at end of file +} diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/RequestScopedBean.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/RequestScopedBean.java index 112b84d63899b..2bb7a16f0abe8 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/RequestScopedBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/RequestScopedBean.java @@ -1,6 +1,6 @@ package io.quarkus.it.arc; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import io.quarkus.it.arc.somepackage.Superclass; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/TestRequestScopeEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/TestRequestScopeEndpoint.java index 0afcf0bf755cd..00f5ef5d2f8e3 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/TestRequestScopeEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/TestRequestScopeEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.arc; -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("/request-scoped") public class TestRequestScopeEndpoint { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedBean.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedBean.java index f25c5d35b5498..ca5917d32b9e6 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedBean.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; @Dependent public class UnusedBean { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedRemovableBean.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedRemovableBean.java index d63cf95d12bf8..0dfd521cc6b79 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedRemovableBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedRemovableBean.java @@ -1,6 +1,6 @@ package io.quarkus.it.arc; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class UnusedRemovableBean { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedUnremovableBean.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedUnremovableBean.java index 0ed19d3cd5b7d..691cb57c8ee43 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedUnremovableBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/UnusedUnremovableBean.java @@ -1,6 +1,6 @@ package io.quarkus.it.arc; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import io.quarkus.arc.Unremovable; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/Simple.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/Simple.java index dcf3722c6173a..57908f7536efa 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/Simple.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/Simple.java @@ -10,8 +10,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; @Repeatable(Simple.List.class) @Target({ TYPE, METHOD }) diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleBean.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleBean.java index 99312bdf61075..7d1dfc9f9c849 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleBean.java @@ -1,6 +1,6 @@ package io.quarkus.it.arc.interceptor; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SimpleBean { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleInterceptor.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleInterceptor.java index ab254d6292dba..602eb3c1d15f8 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleInterceptor.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/SimpleInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.it.arc.interceptor; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Simple(name = "") @Priority(1) diff --git a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/TestSimpleBeanEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/TestSimpleBeanEndpoint.java index 455fac19c197a..2ffe034a25de6 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/TestSimpleBeanEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/arc/interceptor/TestSimpleBeanEndpoint.java @@ -1,8 +1,8 @@ package io.quarkus.it.arc.interceptor; -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("/simple-bean") public class TestSimpleBeanEndpoint { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/config/ApplicationInfoResource.java b/integration-tests/main/src/main/java/io/quarkus/it/config/ApplicationInfoResource.java index 0081e83ac11e5..b5c1854283019 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/config/ApplicationInfoResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/config/ApplicationInfoResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.config; -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.config.inject.ConfigProperty; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java b/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java index 8ea08182ba035..5c1c1cf4033bc 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java @@ -7,8 +7,8 @@ import java.time.Period; import java.util.Optional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.smallrye.config.ConfigMapping; import io.smallrye.config.WithDefault; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileConfigResource.java b/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileConfigResource.java index 02c0359d6dfa9..3e20f26ad0b87 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileConfigResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileConfigResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.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; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileCustomValueConverter.java b/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileCustomValueConverter.java index 0db5a648ff43b..41abe112f40c6 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileCustomValueConverter.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/config/MicroProfileCustomValueConverter.java @@ -1,6 +1,6 @@ package io.quarkus.it.config; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.eclipse.microprofile.config.spi.Converter; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java b/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java index 0e43fd7200f70..9d1e733ec03e4 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java @@ -3,16 +3,16 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.context.ThreadContext; import org.wildfly.common.Assert; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java b/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java index b82b905a02012..c494ad5bf5fa6 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java @@ -1,15 +1,15 @@ package io.quarkus.it.context; -import javax.inject.Inject; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; import org.wildfly.common.Assert; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/context/RequestBean.java b/integration-tests/main/src/main/java/io/quarkus/it/context/RequestBean.java index c772f5cc9e017..a9ddcc3685635 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/context/RequestBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/context/RequestBean.java @@ -1,6 +1,6 @@ package io.quarkus.it.context; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestBean { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CharSetSupport.java b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CharSetSupport.java index c3aeb78b38931..382978995ecbc 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CharSetSupport.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CharSetSupport.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.nio.charset.Charset; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "CoreReflectionTestEndpoint", urlPatterns = "/core/charsetsupport") public class CharSetSupport extends HttpServlet { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CustomConfigTesting.java b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CustomConfigTesting.java index 458478240525d..ea68466d835c3 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CustomConfigTesting.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/CustomConfigTesting.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.util.Optional; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/ReflectionTestEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/ReflectionTestEndpoint.java index c1e366ca81db6..a905a1499845c 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/ReflectionTestEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/ReflectionTestEndpoint.java @@ -4,10 +4,10 @@ import java.io.PrintWriter; import java.lang.reflect.Method; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Some core reflection functionality tests diff --git a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/SerializationTestEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/SerializationTestEndpoint.java index 0a73b4cebea10..0225e44583806 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/corestuff/SerializationTestEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/corestuff/SerializationTestEndpoint.java @@ -9,10 +9,10 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.it.corestuff.serialization.ExternalizablePerson; import io.quarkus.it.corestuff.serialization.Person; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceResource.java b/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceResource.java index b1392bc677c5c..dda0fd11fba0c 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceResource.java @@ -4,15 +4,16 @@ import java.sql.ResultSet; import java.sql.Statement; -import javax.annotation.PostConstruct; -import javax.inject.Inject; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; + +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/datasource") public class DatasourceResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceSetup.java b/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceSetup.java index df577ebbecc68..a7f1368c1922d 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceSetup.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/datasource/DatasourceSetup.java @@ -3,11 +3,12 @@ import java.sql.Connection; import java.sql.Statement; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + @ApplicationScoped public class DatasourceSetup { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java index a7dfa837d8505..066599ea669bf 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicInteger; -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("/ft") public class FaultToleranceTestResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/PreconfiguredFaultTolerance.java b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/PreconfiguredFaultTolerance.java index d17ab8da7d9d2..720fc6abb0450 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/PreconfiguredFaultTolerance.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/PreconfiguredFaultTolerance.java @@ -1,7 +1,7 @@ package io.quarkus.it.faulttolerance; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import io.smallrye.common.annotation.Identifier; import io.smallrye.faulttolerance.api.FaultTolerance; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/Service.java b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/Service.java index a9718e90a9727..abdab357c779e 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/Service.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/Service.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/Feed.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/Feed.java index b43b63c395010..013c4798b961a 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/Feed.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/Feed.java @@ -10,16 +10,17 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; import javax.xml.datatype.XMLGregorianCalendar; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; + /** *

    * Java class for anonymous complex type. diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/ObjectFactory.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/ObjectFactory.java index 801d58b7b22dc..26d749ef0fac9 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/ObjectFactory.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/ObjectFactory.java @@ -7,7 +7,7 @@ package io.quarkus.it.jaxb.mapper.codegen.feed; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/package-info.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/package-info.java index 6a1cb0da061ca..7e8f95332b6e8 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/package-info.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/codegen/feed/package-info.java @@ -5,5 +5,5 @@ // Generated on: 2014.09.12 at 03:00:35 PM CEST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2005/Atom", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2005/Atom", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.quarkus.it.jaxb.mapper.codegen.feed; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/process/UnmarshalRSSProcess.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/process/UnmarshalRSSProcess.java index 7f47faa1ba1b1..d753d93bc5f1a 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/process/UnmarshalRSSProcess.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/mapper/process/UnmarshalRSSProcess.java @@ -5,9 +5,9 @@ import java.util.Collection; import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import io.quarkus.it.jaxb.mapper.codegen.feed.Feed; import io.quarkus.it.jaxb.mapper.codegen.feed.Feed.Entry; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/object/QuarkusNews.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/object/QuarkusNews.java index e2f6df8f8c2c8..b122eccec1f55 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/object/QuarkusNews.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/object/QuarkusNews.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Date; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import io.quarkus.runtime.annotations.RegisterForReflection; @@ -135,4 +135,4 @@ public Category getCategory() { public void setCategory(Category category) { this.category = category; } -} \ No newline at end of file +} diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java index b74fd42395b8e..a167fec375b85 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.Collection; -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 io.quarkus.it.jaxb.mapper.process.UnmarshalRSSProcess; import io.quarkus.it.jaxb.object.Category; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Address.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Address.java index 6e1a6cb82ef56..6073b68475e45 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Address.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Address.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * This is an enmarked @Embeddable class. diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java index a7b9ad9d1854b..fdef09bdb6002 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/CustomTypeEntity.java @@ -2,11 +2,11 @@ import java.math.BigInteger; -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; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Customer.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Customer.java index d481a8f00e2cb..183dace3b4d67 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Customer.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Customer.java @@ -1,8 +1,8 @@ package io.quarkus.it.jpa; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * Used to test reflection references for JPA diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Human.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Human.java index cc0b91adf7685..9cffbb798a365 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Human.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Human.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * Mapped superclass test diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPACustomUserTypeEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPACustomUserTypeEndpoint.java index a5533e6046a79..b850a4f1997f0 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPACustomUserTypeEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPACustomUserTypeEndpoint.java @@ -2,13 +2,13 @@ import java.math.BigInteger; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/jpa/custom-user-types") public class JPACustomUserTypeEndpoint { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestBootstrapEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestBootstrapEndpoint.java index 510456061882a..099b23bea29d7 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestBootstrapEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestBootstrapEndpoint.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.it.common.Clown; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestEMInjectionEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestEMInjectionEndpoint.java index 43e62198943fb..3969e535db56a 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestEMInjectionEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestEMInjectionEndpoint.java @@ -5,17 +5,17 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.transaction.UserTransaction; /** * Various tests for the JPA integration. diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestReflectionEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestReflectionEndpoint.java index 2cae62abe5297..c19994e8e6082 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestReflectionEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JPATestReflectionEndpoint.java @@ -5,10 +5,10 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Various tests for the JPA integration. diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Person.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Person.java index 62f533a29ac8d..022c18e6fd5a0 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/Person.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/Person.java @@ -1,12 +1,12 @@ package io.quarkus.it.jpa; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Person { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/SequencedAddress.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/SequencedAddress.java index fe669f03e141b..c18a9290c3c9d 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/SequencedAddress.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/SequencedAddress.java @@ -1,9 +1,9 @@ package io.quarkus.it.jpa; -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 public class SequencedAddress { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/WorkAddress.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/WorkAddress.java index 21bf71f1c54a6..0a60da7f9cec9 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/WorkAddress.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/jpa/WorkAddress.java @@ -1,6 +1,6 @@ package io.quarkus.it.jpa; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * Class marked @Embeddable explicitly so it is picked up. diff --git a/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean1.java b/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean1.java index 62dff8f756959..80c83891f52e3 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean1.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean1.java @@ -1,6 +1,6 @@ package io.quarkus.it.mock; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MockableBean1 { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean2.java b/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean2.java index b7133b9d70bbc..cdf16bc322a30 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean2.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/mock/MockableBean2.java @@ -1,6 +1,6 @@ package io.quarkus.it.mock; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class MockableBean2 { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java b/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java index 756847cd0c517..a78519c8d7ca6 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java @@ -1,11 +1,12 @@ package io.quarkus.it.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams; import io.smallrye.mutiny.Multi; +import mutiny.zero.flow.adapters.AdaptersToReactiveStreams; @Path("/reactive") public class ReactiveStreamOpsResource { @@ -30,7 +31,7 @@ public String stream1() { @Path("/stream-mutiny") public String stream2() { StringBuilder builder = new StringBuilder(); - ReactiveStreams.fromPublisher(Multi.createFrom().items("d", "e", "f")) + ReactiveStreams.fromPublisher(AdaptersToReactiveStreams.publisher(Multi.createFrom().items("d", "e", "f"))) .map(String::toUpperCase) .forEach(builder::append) .run(); diff --git a/integration-tests/main/src/main/java/io/quarkus/it/resources/ResourcesResource.java b/integration-tests/main/src/main/java/io/quarkus/it/resources/ResourcesResource.java index e8d995b43d478..dbe27b260a18c 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/resources/ResourcesResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/resources/ResourcesResource.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.net.URL; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.core.Response; @Path("/resources") public class ResourcesResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/AnnotatedInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/AnnotatedInterface.java index 19cb378f6cf07..302fcad972d64 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/AnnotatedInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/AnnotatedInterface.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/interface") public interface AnnotatedInterface { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ApplicationFooProvider.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ApplicationFooProvider.java index 4cf039f525e2e..fe2402799836b 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ApplicationFooProvider.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ApplicationFooProvider.java @@ -6,12 +6,12 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.Produces; -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.Produces; +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; @Provider @Produces("application/foo") diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientProducer.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientProducer.java index bdecb1b05e532..c3e3f742d5b59 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientProducer.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientProducer.java @@ -1,11 +1,11 @@ package io.quarkus.it.rest; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; @ApplicationScoped public class ClientProducer { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java index 58b105a9a5930..ea7f1c3da7a90 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java @@ -6,13 +6,13 @@ import java.util.Set; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/EnvelopeClassResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/EnvelopeClassResource.java index 72c8c0021f35f..cef02b1af2b35 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/EnvelopeClassResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/EnvelopeClassResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/envelope") public class EnvelopeClassResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ExternalService.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ExternalService.java index 12c528fb65dfb..a02d5a876d3b3 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ExternalService.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ExternalService.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ExternalService { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClient.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClient.java index 0ec795e4dd6e6..c863954651fa1 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClient.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClient.java @@ -2,9 +2,9 @@ import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("gouv-geo-api") public interface GouvFrGeoApiClient { @@ -13,4 +13,4 @@ public interface GouvFrGeoApiClient { @Path("/communes") public Set getCommunes( @QueryParam("codePostal") String postalCode); -} \ No newline at end of file +} diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java index 2546b75b6afdb..44aa5ca75a253 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java @@ -4,9 +4,9 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("gouv-geo-api") public class GouvFrGeoApiClientImpl { @@ -21,4 +21,4 @@ public Set getCommunes( ret.add(new Commune("Paris", "75056", "75", "11", cp, 2190327)); return ret; } -} \ No newline at end of file +} diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/Greeting.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/Greeting.java index 46234cd72faf3..8d0bad219a7fc 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/Greeting.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/Greeting.java @@ -2,8 +2,8 @@ import java.time.LocalDate; -import javax.json.bind.annotation.JsonbCreator; -import javax.json.bind.annotation.JsonbProperty; +import jakarta.json.bind.annotation.JsonbCreator; +import jakarta.json.bind.annotation.JsonbProperty; public class Greeting { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingEndpoint.java index f9688ee1bab9e..10b0bf01cfaae 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingEndpoint.java @@ -1,10 +1,10 @@ package io.quarkus.it.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.jboss.resteasy.annotations.jaxrs.PathParam; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingService.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingService.java index 0551a7d62a2e4..09ca75b355016 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingService.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/LoggingFilter.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/LoggingFilter.java index 87f8f21cba95e..ea9e68d42d07f 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/LoggingFilter.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/LoggingFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,4 +30,4 @@ public void filter(ClientRequestContext requestContext) CALL_COUNT++; log.info(">> {} {}", requestContext.getMethod(), requestContext.getUri()); } -} \ No newline at end of file +} diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java index 94c479344b730..e7f031230da1a 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java @@ -2,8 +2,8 @@ import java.time.LocalDate; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/loopback") public class LoopbackResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ProgrammaticRestInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ProgrammaticRestInterface.java index aa550be6bab15..d8065e3d1fcb8 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ProgrammaticRestInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ProgrammaticRestInterface.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACBean.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACBean.java index b8734405cf5ab..251ae5cde6f02 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACBean.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACBean.java @@ -1,9 +1,9 @@ package io.quarkus.it.rest; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.security.Authenticated; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACSecuredResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACSecuredResource.java index 033c9cbf79319..1d022d75ba41b 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACSecuredResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RBACSecuredResource.java @@ -1,15 +1,15 @@ package io.quarkus.it.rest; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; import io.quarkus.security.Authenticated; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ReflectionResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ReflectionResource.java index 4ced953e49df0..a5211b90cc6dc 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ReflectionResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ReflectionResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/reflection") public class ReflectionResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RemovedJaxRsApplication.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RemovedJaxRsApplication.java index 608a16672b605..a087fd07c084b 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RemovedJaxRsApplication.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RemovedJaxRsApplication.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * This class is actually never used, because we configure Quarkus to remove it from Class Loading and build time indexing diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientBaseUriConfigKeyInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientBaseUriConfigKeyInterface.java index b50d19ad1f77e..06d49569d4a15 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientBaseUriConfigKeyInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientBaseUriConfigKeyInterface.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest; -import javax.enterprise.context.Dependent; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientConfigKeyInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientConfigKeyInterface.java index 10d4ca1bbf2f9..5bfcfbe25b2b1 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientConfigKeyInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientConfigKeyInterface.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest; -import javax.enterprise.context.Dependent; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java index 85cf390a37c94..37a7621f1d5dc 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java @@ -1,10 +1,10 @@ package io.quarkus.it.rest; -import javax.enterprise.context.Dependent; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java index b7b7a02321fe1..924b45d150275 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest; -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; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java index 994a7e76a75bd..352142a015294 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java @@ -4,10 +4,10 @@ import java.util.Map; import java.util.concurrent.CompletionStage; -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 org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ServerSentEventResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ServerSentEventResource.java index 5596d6a6d8b4d..3d3e00f749291 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ServerSentEventResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ServerSentEventResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.rest; -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.sse.OutboundSseEvent; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; +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.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.annotations.SseElementType; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ServiceWithConfig.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ServiceWithConfig.java index 211fc7180c648..baa910ec4c70d 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ServiceWithConfig.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ServiceWithConfig.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/Someservice.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/Someservice.java index 86a62f7de79de..8074406515471 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/Someservice.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/Someservice.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Someservice { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/SslClientResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/SslClientResource.java index 0e587cfc82461..8587a5e236690 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/SslClientResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/SslClientResource.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest; -import javax.inject.Inject; -import javax.ws.rs.GET; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/SslRestInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/SslRestInterface.java index 3bd261f0efefa..2480f127d9732 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/SslRestInterface.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/SslRestInterface.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest; -import javax.ws.rs.GET; +import jakarta.ws.rs.GET; /** * Disabled by default as it establishes external connections. diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java index bd24ac2f88096..41a282aba4a3d 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java @@ -9,28 +9,28 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; -import javax.json.bind.JsonbConfig; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.POST; -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.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.json.bind.JsonbConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.POST; +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.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.xml.bind.annotation.XmlRootElement; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceForConstructorProperties.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceForConstructorProperties.java index 1e98fa4c9c1e2..0b04dbbdd39e7 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceForConstructorProperties.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceForConstructorProperties.java @@ -2,16 +2,16 @@ import java.beans.ConstructorProperties; -import javax.json.bind.JsonbBuilder; -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.Response; -import javax.ws.rs.sse.OutboundSseEvent; -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; +import jakarta.json.bind.JsonbBuilder; +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.Response; +import jakarta.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; import org.jboss.resteasy.annotations.SseElementType; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithConstructorInjection.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithConstructorInjection.java index c6233de4b45a6..011ac1090a4ce 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithConstructorInjection.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithConstructorInjection.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/testCtor") public class TestResourceWithConstructorInjection { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithTwoConstructors.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithTwoConstructors.java index 048bd02664e29..08ddfba8c6aef 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithTwoConstructors.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithTwoConstructors.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest; -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("/testCtor2") public class TestResourceWithTwoConstructors { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithVariable.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithVariable.java index 431464585c119..63940f8a4cf93 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithVariable.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResourceWithVariable.java @@ -1,10 +1,10 @@ package io.quarkus.it.rest; -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; @Path("/otherTest/{name:[a-z]{1,10}}") public class TestResourceWithVariable { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/scheduler/CountResource.java b/integration-tests/main/src/main/java/io/quarkus/it/scheduler/CountResource.java index 3e713438cf322..35ee2b06bd2c8 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/scheduler/CountResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/scheduler/CountResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.scheduler; -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/integration-tests/main/src/main/java/io/quarkus/it/scheduler/Counter.java b/integration-tests/main/src/main/java/io/quarkus/it/scheduler/Counter.java index b9a72cb811617..0f9d83b06a317 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/scheduler/Counter.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/scheduler/Counter.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.scheduler.Scheduled; @@ -26,4 +26,4 @@ void increment() { counter.incrementAndGet(); } -} \ No newline at end of file +} diff --git a/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java b/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java index 4e8ab58923512..0617149702e39 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java @@ -2,12 +2,12 @@ import java.util.concurrent.atomic.AtomicBoolean; -import javax.inject.Inject; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/txn/txendpoint") public class TransactionResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/validator/Hello.java b/integration-tests/main/src/main/java/io/quarkus/it/validator/Hello.java index 8e4b030de7f6d..8680be6c5ad0c 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/validator/Hello.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/validator/Hello.java @@ -1,14 +1,14 @@ package io.quarkus.it.validator; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; @Entity @Table(name = "Hello") diff --git a/integration-tests/main/src/main/java/io/quarkus/it/validator/Human.java b/integration-tests/main/src/main/java/io/quarkus/it/validator/Human.java index 621fbe0edffd7..2c450c52658e9 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/validator/Human.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/validator/Human.java @@ -3,14 +3,14 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import com.sun.istack.NotNull; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorAndHibernateORMEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorAndHibernateORMEndpoint.java index d85d6c983b6d1..263577c48dc62 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorAndHibernateORMEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorAndHibernateORMEndpoint.java @@ -1,11 +1,11 @@ package io.quarkus.it.validator; -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 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; /** * Verifies that Hibernate Validator can use Hibernate ORM's PersistenceUtilHelper diff --git a/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorEndpoint.java index 956a95354af9a..5e5185fc20363 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/validator/TestValidatorEndpoint.java @@ -2,13 +2,13 @@ import java.util.Set; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import javax.validation.constraints.Size; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/validator") public class TestValidatorEndpoint { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/web/DummyContainerRequestFilter.java b/integration-tests/main/src/main/java/io/quarkus/it/web/DummyContainerRequestFilter.java index 93c249d9c193c..79b50245c4d7f 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/web/DummyContainerRequestFilter.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/web/DummyContainerRequestFilter.java @@ -2,11 +2,11 @@ import java.util.Objects; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.HttpRequest; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/web/TestFilter.java b/integration-tests/main/src/main/java/io/quarkus/it/web/TestFilter.java index 2292d5f948c4b..82d0febe48b9e 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/web/TestFilter.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/web/TestFilter.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebFilter; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.http.HttpFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.http.HttpFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebFilter(urlPatterns = "/filter", initParams = { @WebInitParam(name = "message", value = "A Filter") }) public class TestFilter extends HttpFilter { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/web/TestSecureServlet.java b/integration-tests/main/src/main/java/io/quarkus/it/web/TestSecureServlet.java index a95550ddf5103..4e2095424ca03 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/web/TestSecureServlet.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/web/TestSecureServlet.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.annotation.HttpConstraint; -import javax.servlet.annotation.ServletSecurity; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.HttpConstraint; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Basic secured servlet test target diff --git a/integration-tests/main/src/main/java/io/quarkus/it/web/TestServlet.java b/integration-tests/main/src/main/java/io/quarkus/it/web/TestServlet.java index 3bb818e7791c9..6c53c999e95b6 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/web/TestServlet.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/web/TestServlet.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java index 93dd2b6222880..1dae4b42d0aa5 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java @@ -1,14 +1,14 @@ package io.quarkus.it.websocket; -import javax.enterprise.inject.spi.DeploymentException; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; import io.quarkus.runtime.annotations.RegisterForReflection; @@ -24,7 +24,7 @@ public void contextInitialized(ServletContextEvent sce) { ((ServerContainer) sce.getServletContext().getAttribute(ServerContainer.class.getName())) .addEndpoint(ServerEndpointConfig.Builder.create(WebSocketEndpoint.class, "/added-dynamic").build()); - } catch (DeploymentException | javax.websocket.DeploymentException e) { + } catch (DeploymentException | jakarta.websocket.DeploymentException e) { throw new RuntimeException(e); } } diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientCodingResource.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientCodingResource.java index db1ef31b3492d..2a743a2e9ad4f 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientCodingResource.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientCodingResource.java @@ -4,11 +4,11 @@ import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/ws-client-coding-test") public class ClientCodingResource { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoDecoder.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoDecoder.java index 96523e064684b..1a235a8cef4f4 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoDecoder.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoDecoder.java @@ -4,8 +4,8 @@ import java.io.IOException; import java.io.Reader; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; public class ClientDtoDecoder implements Decoder.TextStream { @Override diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoEncoder.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoEncoder.java index 036bb8c390f3c..2c6390fa4e0e2 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoEncoder.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ClientDtoEncoder.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.io.Writer; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class ClientDtoEncoder implements Encoder.TextStream { @Override diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/CodingClient.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/CodingClient.java index 676c1e01f24c9..ba67bfce76c61 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/CodingClient.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/CodingClient.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; @ClientEndpoint(decoders = ClientDtoDecoder.class, encoders = ClientDtoEncoder.class) public class CodingClient { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/EchoSocket.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/EchoSocket.java index b428125c38570..3792ed7bda225 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/EchoSocket.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/EchoSocket.java @@ -1,7 +1,7 @@ package io.quarkus.it.websocket; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo") public class EchoSocket { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/RecodingSocket.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/RecodingSocket.java index 7244e59d5a7c7..7ee349d023631 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/RecodingSocket.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/RecodingSocket.java @@ -1,7 +1,7 @@ package io.quarkus.it.websocket; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/recoder", encoders = ServerDtoEncoder.class, decoders = ServerDtoDecoder.class) public class RecodingSocket { diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoDecoder.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoDecoder.java index bc0c3a769587b..b45872e952c8a 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoDecoder.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoDecoder.java @@ -2,11 +2,11 @@ import java.io.Reader; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; public class ServerDtoDecoder implements Decoder.TextStream { @Override diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoEncoder.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoEncoder.java index bf25c1ccddb7d..bf5a8d5160145 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoEncoder.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/ServerDtoEncoder.java @@ -2,11 +2,11 @@ import java.io.Writer; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonWriter; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonWriter; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class ServerDtoEncoder implements Encoder.TextStream { @Override diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/WebSocketOpenEndpoint.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/WebSocketOpenEndpoint.java index a0182b32b6fc7..c7ae00af38d04 100644 --- a/integration-tests/main/src/main/java/io/quarkus/it/websocket/WebSocketOpenEndpoint.java +++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/WebSocketOpenEndpoint.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/wsopen") @ApplicationScoped diff --git a/integration-tests/main/src/main/resources/application.properties b/integration-tests/main/src/main/resources/application.properties index 1cc81a74d60c0..554c187036e2f 100644 --- a/integration-tests/main/src/main/resources/application.properties +++ b/integration-tests/main/src/main/resources/application.properties @@ -1,6 +1,6 @@ io.quarkus.it.rest.GouvFrGeoApiClient/mp-rest/url=${test.url} io.quarkus.it.rest.RestInterface/mp-rest/url=${test.url} -io.quarkus.it.rest.RestInterface/mp-rest/scope=javax.inject.Singleton +io.quarkus.it.rest.RestInterface/mp-rest/scope=jakarta.inject.Singleton io.quarkus.it.rest.RestClientInterface/mp-rest/url=${test.url} io.quarkus.it.rest.RestClientWithFaultToleranceInterface/mp-rest/url=${test.url} restClientConfigKey/mp-rest/url=${test.url} diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/BeanManagerInjectionInTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/BeanManagerInjectionInTestCase.java index d68a7c67d8cbe..377436b7ecaf5 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/BeanManagerInjectionInTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/BeanManagerInjectionInTestCase.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/BeanOnlyInTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/BeanOnlyInTestCase.java index 103eaa5645aef..927ba365f20d6 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/BeanOnlyInTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/BeanOnlyInTestCase.java @@ -6,9 +6,9 @@ import java.lang.reflect.Field; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/BonjourService.java b/integration-tests/main/src/test/java/io/quarkus/it/main/BonjourService.java index 1a7b9bfbcb80c..7689ff850c8d2 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/BonjourService.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/BonjourService.java @@ -1,7 +1,7 @@ package io.quarkus.it.main; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import io.quarkus.it.rest.GreetingService; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/DynamicTestsTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/DynamicTestsTestCase.java index b1307e8c6a569..9273b9f926e80 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/DynamicTestsTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/DynamicTestsTestCase.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java index 8c196459760cb..053e1e30521d1 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JUnit5PerClassLifecycleTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.main; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java index 78be989720887..9f61ac77e2137 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java @@ -8,8 +8,8 @@ import java.io.StringWriter; import java.util.zip.GZIPOutputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MethodSourceTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MethodSourceTest.java index 44b27e825463b..f17579c86b365 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MethodSourceTest.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MethodSourceTest.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MockExternalService.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MockExternalService.java index 4ceee71db3009..210e29112ba0d 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MockExternalService.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MockExternalService.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; import io.quarkus.it.rest.ExternalService; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java index 19a410fdddd6c..36c0ea3fdd029 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java @@ -1,6 +1,6 @@ package io.quarkus.it.main; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MockitoTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MockitoTest.java index 60513989327a1..444539613ae90 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/MockitoTest.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MockitoTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.mock; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java index 92f106c420df6..501f425922b7d 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java @@ -8,9 +8,9 @@ import java.util.Iterator; import java.util.Set; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ParameterResolverTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ParameterResolverTest.java index 9d0f423ec0dcc..949e5be3f72e7 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ParameterResolverTest.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ParameterResolverTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java index b1b51ef8f50d6..79eeef6bcfbb1 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java @@ -10,7 +10,7 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java index d5f41f180751b..cac6419554eb3 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java @@ -135,8 +135,8 @@ void testMicroprofileRestClientDefaultScope() { .when().get("/client/cdi/default-scope-on-interface") .getBody().print(); - Assertions.assertEquals("javax.inject.Singleton", responseWithSingletonScope); - Assertions.assertEquals("javax.enterprise.context.Dependent", responseWithDefaultScope); + Assertions.assertEquals("jakarta.inject.Singleton", responseWithSingletonScope); + Assertions.assertEquals("jakarta.enterprise.context.Dependent", responseWithDefaultScope); } @Test diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/TestStereotypeTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/TestStereotypeTestCase.java index a168d9a53f26a..23e4ca5578532 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/TestStereotypeTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/TestStereotypeTestCase.java @@ -1,8 +1,8 @@ package io.quarkus.it.main; -import javax.inject.Inject; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalQuarkusTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalQuarkusTest.java index d8284612b1ecc..4914cf973b7e1 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalQuarkusTest.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalQuarkusTest.java @@ -5,8 +5,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; -import javax.transaction.Transactional; +import jakarta.enterprise.inject.Stereotype; +import jakarta.transaction.Transactional; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalTestMethodTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalTestMethodTestCase.java index 1f747102a4989..cb50b6cf50c59 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalTestMethodTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionalTestMethodTestCase.java @@ -1,9 +1,9 @@ package io.quarkus.it.main; -import javax.inject.Inject; -import javax.transaction.Status; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorTestCase.java index 71a06551ee37c..0819fc32c322d 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ValidatorTestCase.java @@ -7,7 +7,7 @@ import java.net.URLConnection; import java.nio.charset.StandardCharsets; -import javax.json.Json; +import jakarta.json.Json; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java index e92668b8eb883..af4f382ad2f17 100644 --- a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java +++ b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java @@ -6,12 +6,12 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/maven/pom.xml b/integration-tests/maven/pom.xml index 02dcbbe6adb60..61a71dc9f1e43 100644 --- a/integration-tests/maven/pom.xml +++ b/integration-tests/maven/pom.xml @@ -26,8 +26,8 @@ test - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api test diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddedRestEndpoint.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddedRestEndpoint.java index 0a933fd3a2e0c..5f342ef33453d 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddedRestEndpoint.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddedRestEndpoint.java @@ -1,7 +1,7 @@ package io.quarkus.maven.it; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/added") public class AddedRestEndpoint { diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java index 9ca1f763aa0b5..80740086cf898 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java @@ -710,10 +710,10 @@ public void testThatTheApplicationIsReloadedOnNewResource() throws MavenInvocati File source = new File(testDir, "src/main/java/org/acme/MyNewResource.java"); String myNewResource = "package org.acme;\n" + "\n" + - "import javax.ws.rs.GET;\n" + - "import javax.ws.rs.Path;\n" + - "import javax.ws.rs.Produces;\n" + - "import javax.ws.rs.core.MediaType;\n" + + "import jakarta.ws.rs.GET;\n" + + "import jakarta.ws.rs.Path;\n" + + "import jakarta.ws.rs.Produces;\n" + + "import jakarta.ws.rs.core.MediaType;\n" + "\n" + "@Path(\"/foo\")\n" + "public class MyNewResource {\n" + @@ -739,10 +739,10 @@ public void testThatClassFileAreCleanedUp() throws MavenInvocationException, IOE File source = new File(testDir, "src/main/java/org/acme/ClassDeletionResource.java"); String classDeletionResource = "package org.acme;\n" + "\n" + - "import javax.ws.rs.GET;\n" + - "import javax.ws.rs.Path;\n" + - "import javax.ws.rs.Produces;\n" + - "import javax.ws.rs.core.MediaType;\n" + + "import jakarta.ws.rs.GET;\n" + + "import jakarta.ws.rs.Path;\n" + + "import jakarta.ws.rs.Produces;\n" + + "import jakarta.ws.rs.core.MediaType;\n" + "\n" + "@Path(\"/deletion\")\n" + "public class ClassDeletionResource {\n" + @@ -1082,7 +1082,7 @@ public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationEx File source = new File(testDir, "src/main/java/org/acme/MyBean.java"); String content = "package org.acme;\n" + "\n" + - "import javax.enterprise.context.ApplicationScoped;\n" + + "import jakarta.enterprise.context.ApplicationScoped;\n" + "\n" + "@ApplicationScoped\n" + "public class MyBean {\n" + diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java index 5c8887b6e6c55..b99b46ab347e9 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java @@ -68,10 +68,10 @@ public void testThatTheApplicationIsReloadedOnNewResource() throws MavenInvocati File source = new File(agentDir, "src/main/java/org/acme/MyNewResource.java"); String myNewResource = "package org.acme;\n" + "\n" + - "import javax.ws.rs.GET;\n" + - "import javax.ws.rs.Path;\n" + - "import javax.ws.rs.Produces;\n" + - "import javax.ws.rs.core.MediaType;\n" + + "import jakarta.ws.rs.GET;\n" + + "import jakarta.ws.rs.Path;\n" + + "import jakarta.ws.rs.Produces;\n" + + "import jakarta.ws.rs.core.MediaType;\n" + "\n" + "@Path(\"/foo\")\n" + "public class MyNewResource {\n" + @@ -204,7 +204,7 @@ public void testThatNewBeanAreDiscovered() throws IOException, MavenInvocationEx File source = new File(agentDir, "src/main/java/org/acme/MyBean.java"); String content = "package org.acme;\n" + "\n" + - "import javax.enterprise.context.ApplicationScoped;\n" + + "import jakarta.enterprise.context.ApplicationScoped;\n" + "\n" + "@ApplicationScoped\n" + "public class MyBean {\n" + diff --git a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java index bc98dd59f27d2..d45fcdd8cfff1 100644 --- a/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java +++ b/integration-tests/maven/src/test/resources-filtered/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java @@ -16,8 +16,8 @@ */ package org.acme.my.project.itest.it; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.Path; @Path("/itest") @ApplicationScoped diff --git a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/library/src/main/java/org/acme/SomeBean.java b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/library/src/main/java/org/acme/SomeBean.java index 8d0fe720363d5..31efa684f8476 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/library/src/main/java/org/acme/SomeBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/library/src/main/java/org/acme/SomeBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SomeBean { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/src/main/java/org/acme/HelloResource.java index ba370801fa508..70a93d74748f6 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/runner/src/main/java/org/acme/HelloResource.java @@ -2,12 +2,12 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.inject.Instance; -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.enterprise.inject.Instance; +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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java index a0db2386f1c56..602fe5d73fe64 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java index 6fe83a9616388..a794439b3e88f 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java @@ -3,7 +3,7 @@ import io.quarkus.arc.profile.IfBuildProfile; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @IfBuildProfile("foo") @ApplicationScoped diff --git a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java index a0db2386f1c56..602fe5d73fe64 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java index 6fe83a9616388..a794439b3e88f 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java @@ -3,7 +3,7 @@ import io.quarkus.arc.profile.IfBuildProfile; import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @IfBuildProfile("foo") @ApplicationScoped diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/src/main/java/org/acme/HelloResource.java index 42203e0efd1f5..b66c0fde53e15 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/runner/src/main/java/org/acme/HelloResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/src/main/java/org/acme/HelloResource.java index 42203e0efd1f5..b66c0fde53e15 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/runner/src/main/java/org/acme/HelloResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloResource.java index 73249cf00c058..7e05efa7335ba 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloResource.java @@ -1,10 +1,10 @@ package org.acme; -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 java.util.UUID; @Path("/app") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloService.java index bfe7fc496c202..1e1a73e11af21 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloService.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-inst/src/main/java/org/acme/HelloService.java @@ -2,8 +2,8 @@ import io.quarkus.runtime.StartupEvent; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; @ApplicationScoped public class HelloService { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/HelloResource.java index 99a017deb66be..296bdfb52c794 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-build/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java index e05e3fc81410a..fbb27b57b28fc 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/src/main/java/org/acme/HelloResource.java index 64675366c9153..37cfafed7e8cd 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-no-undertow/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/HelloResource.java index 423468dfb8864..edfd6f0786f66 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-noconfig/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/ClasspathResources.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/ClasspathResources.java index 6f8beb61aa115..1e79843e730b3 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/ClasspathResources.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/ClasspathResources.java @@ -2,10 +2,10 @@ import org.apache.commons.io.IOUtils; -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 java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/HelloResource.java index 4b26e9a74e6ec..c21e5305ea793 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-remote-dev/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/src/main/java/org/acme/HelloResource.java index 64675366c9153..37cfafed7e8cd 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic-resource-filtering/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ClasspathResources.java b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ClasspathResources.java index 1928f47531c2a..e1da81f1b750a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ClasspathResources.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ClasspathResources.java @@ -1,12 +1,12 @@ package org.acme; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import org.apache.commons.io.IOUtils; -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 java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/HelloResource.java index 4b26e9a74e6ec..c21e5305ea793 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ProtectionDomain.java b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ProtectionDomain.java index 1ff398c3bc262..36cfbe3d82e5e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ProtectionDomain.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classic/src/main/java/org/acme/ProtectionDomain.java @@ -2,8 +2,8 @@ import org.apache.commons.io.IOUtils; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/HelloResource.java index 8108949192ae6..fd515e41ccb3b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/HelloResource.java @@ -1,12 +1,12 @@ package org.acme; -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 javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; @Path("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/Producer.java b/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/Producer.java index 4237af3c413d2..45d42b257f39a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/Producer.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/classloader-linkage-error/src/main/java/org/acme/Producer.java @@ -1,8 +1,8 @@ package org.acme; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.xml.bind.JAXBContext; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.xml.bind.JAXBContext; public class Producer { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/src/main/java/org/acme/codegen/deployment/AcmeCodegenProvider.java b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/src/main/java/org/acme/codegen/deployment/AcmeCodegenProvider.java index 26a3a961c433b..d88ad68ebc286 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/src/main/java/org/acme/codegen/deployment/AcmeCodegenProvider.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/acme-codegen/deployment/src/main/java/org/acme/codegen/deployment/AcmeCodegenProvider.java @@ -73,8 +73,8 @@ private static void generateEndpoint(Path outputDir, String name, String value) Files.createDirectories(javaFile.getParent()); try(PrintWriter out = new PrintWriter(Files.newBufferedWriter(javaFile))) { out.println("package org.acme;"); - out.println("import javax.ws.rs.GET;"); - out.println("import javax.ws.rs.Path;"); + out.println("import jakarta.ws.rs.GET;"); + out.println("import jakarta.ws.rs.Path;"); out.println("@Path(\"/codegen-config\")"); out.println("public class " + className + " {"); out.println(" @GET"); diff --git a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/java/org/acme/GreetingResource.java b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/java/org/acme/GreetingResource.java index 3868368bf9377..32321c0329c6e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/java/org/acme/GreetingResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/codegen-config-factory/app/src/main/java/org/acme/GreetingResource.java @@ -1,7 +1,7 @@ package org.acme; -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; import org.jboss.resteasy.reactive.RestPath; @@ -25,4 +25,4 @@ public String hello(@RestPath String name) { } throw new IllegalArgumentException(name); } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/src/main/java/org/acme/HelloResource.java index 78696e1cf40fb..9b81f9385f088 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/runner/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/src/main/java/org/acme/HelloResource.java index ea2d10cf459a3..967bc8098072f 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/custom-manifest-attributes/src/main/java/org/acme/HelloResource.java @@ -2,10 +2,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java index e05e3fc81410a..fbb27b57b28fc 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java index ce1b38ba72d71..ad4f9038a9210 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/HelloResource.java index dacee899bd8f4..2326cb0451112 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/HelloResource.java @@ -2,10 +2,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-file-deletion/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/HelloResource.java index 3dc7e048691f4..60066e15f3b5b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/HelloResource.java @@ -2,10 +2,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs-with-profile/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/HelloResource.java index 3dc7e048691f4..60066e15f3b5b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/HelloResource.java @@ -2,10 +2,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-multiple-resource-dirs/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java index dc1e6a12d0ca6..1ab21e5cb6826 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/src/main/java/org/acme/MetaInfResource.java b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/src/main/java/org/acme/MetaInfResource.java index c1b17b6427f9f..85ee1ff8f4041 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/src/main/java/org/acme/MetaInfResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/runner/src/main/java/org/acme/MetaInfResource.java @@ -3,14 +3,14 @@ import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.BadRequestException; -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 javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.BadRequestException; +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 jakarta.ws.rs.core.Response.Status; @Path("/meta-inf") public class MetaInfResource { @@ -30,4 +30,4 @@ public String hello(@PathParam("name") String name) { throw new RuntimeException("Failed to read " + url, e); } } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/src/main/java/org/acme/GreetingResource.java b/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/src/main/java/org/acme/GreetingResource.java index e6ae57e005979..40e60916a6d5a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/src/main/java/org/acme/GreetingResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/external-reloadable-artifacts/app/src/main/java/org/acme/GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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.acme.lib.*; @@ -15,4 +15,4 @@ public class GreetingResource { public String get() { return Greeting.hello(); } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/src/main/java/org/acme/HelloResource.java index a405740d8c682..673bff3844f68 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/ignore-entries-uber-jar/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/HelloResource.java index a7dc81de2a568..3ad6dbddc9a5e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/rest/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceBar.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceBar.java index bb187e975bc9f..2497c41e63e6b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceBar.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceBar.java @@ -2,10 +2,10 @@ import io.quarkus.arc.profile.IfBuildProfile; -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; @IfBuildProfile("bar-1") @Path("/hello") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceFoo.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceFoo.java index 5a34fe8edb790..32e4a32b38c11 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceFoo.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-1/src/main/java/org/acme/HelloResourceFoo.java @@ -2,10 +2,10 @@ import io.quarkus.arc.profile.IfBuildProfile; -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; @IfBuildProfile("foo-1") @Path("/hello") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceBar.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceBar.java index 1bb28a41483a0..e89721689740c 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceBar.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceBar.java @@ -2,10 +2,10 @@ import io.quarkus.arc.profile.IfBuildProfile; -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; @IfBuildProfile("bar-2") @Path("/hello") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceFoo.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceFoo.java index 497afdeda151a..821d54aea76db 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceFoo.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/module-2/src/main/java/org/acme/HelloResourceFoo.java @@ -2,10 +2,10 @@ import io.quarkus.arc.profile.IfBuildProfile; -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; @IfBuildProfile("foo-2") @Path("/hello") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceBar.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceBar.java index 7c2e4cc6fa3b4..3b41f1b538e6e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceBar.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceBar.java @@ -2,11 +2,11 @@ import io.quarkus.arc.profile.IfBuildProfile; -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; @IfBuildProfile("bar") @Path("/hello") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceFoo.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceFoo.java index 99c5708a8edb1..2026a909f0abc 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceFoo.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloResourceFoo.java @@ -2,11 +2,11 @@ import io.quarkus.arc.profile.IfBuildProfile; -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; @IfBuildProfile("foo") @Path("/hello") diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloService.java index e9c9cf9b1ab1d..d93fb387db2a2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloService.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/src/main/java/org/acme/HelloService.java @@ -2,7 +2,7 @@ import io.quarkus.arc.profile.IfBuildProfile; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.commons.io.FileUtils; import org.apache.commons.collections4.MultiSet; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeBean.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeBean.java index 584659014dabb..fc6f9fa5e5edc 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class AcmeBean implements Named { @@ -9,4 +9,4 @@ public class AcmeBean implements Named { public String getName() { return "acme"; } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeServiceProducer.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeServiceProducer.java index 29da0b9e97dca..77ca414dfdfb7 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeServiceProducer.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/AcmeServiceProducer.java @@ -1,7 +1,7 @@ package org.acme; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import io.quarkus.arc.DefaultBean; @Dependent @@ -12,4 +12,4 @@ public class AcmeServiceProducer { public Service getAcmeService() { return new AcmeService(); } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Other.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Other.java index ada2f2240fe2b..e14a841792962 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Other.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Other.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Other implements Named { @@ -9,4 +9,4 @@ public class Other implements Named { public String getName() { return "other"; } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Printer.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Printer.java index 8f09858b6b25c..e49796e26eb81 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Printer.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/main/java/org/acme/Printer.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Printer { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/test/java/org/acme/testlib/mock/MockServiceProducer.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/test/java/org/acme/testlib/mock/MockServiceProducer.java index 34bacc873345d..fd6401ea197f8 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/test/java/org/acme/testlib/mock/MockServiceProducer.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/beans/src/test/java/org/acme/testlib/mock/MockServiceProducer.java @@ -1,7 +1,7 @@ package org.acme.testlib.mock; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; import io.quarkus.arc.DefaultBean; import org.acme.Service; @@ -12,4 +12,4 @@ public class MockServiceProducer { public Service getMockService() { return new MockService(); } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/hello/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/hello/src/main/java/org/acme/HelloResource.java index 99680447b5e04..1203c51d101ec 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/hello/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/hello/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/src/test/java/org/acme/ResourceTest.java b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/src/test/java/org/acme/ResourceTest.java index a1f4aa6ef7664..9aa55bd8aa1bf 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/src/test/java/org/acme/ResourceTest.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/runner/src/test/java/org/acme/ResourceTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.CoreMatchers.is; import java.util.UUID; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/rest/src/main/java/org/acme/ClassPathResource.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/rest/src/main/java/org/acme/ClassPathResource.java index ea51fe550c5a0..0dd4c9add624d 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/rest/src/main/java/org/acme/ClassPathResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/rest/src/main/java/org/acme/ClassPathResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level0/src/main/java/org/acme/level0/Level0Service.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level0/src/main/java/org/acme/level0/Level0Service.java index d0d41586a1cb8..cefe0da67277f 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level0/src/main/java/org/acme/level0/Level0Service.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level0/src/main/java/org/acme/level0/Level0Service.java @@ -1,6 +1,6 @@ package org.acme.level0; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level1/src/main/java/org/acme/level1/Level1Service.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level1/src/main/java/org/acme/level1/Level1Service.java index d29dd4fef07b2..bd1cf07fe769b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level1/src/main/java/org/acme/level1/Level1Service.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level1/src/main/java/org/acme/level1/Level1Service.java @@ -1,7 +1,7 @@ package org.acme.level1; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.acme.level0.Level0Service; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level2/submodule/src/main/java/org/acme/level2/submodule/Level2Service.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level2/submodule/src/main/java/org/acme/level2/submodule/Level2Service.java index 8ee37c0979597..e200493f80868 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level2/submodule/src/main/java/org/acme/level2/submodule/Level2Service.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/level2/submodule/src/main/java/org/acme/level2/submodule/Level2Service.java @@ -1,7 +1,7 @@ package org.acme.level2.submodule; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.acme.level1.Level1Service; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/runner/src/main/java/org/acme/rest/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/runner/src/main/java/org/acme/rest/HelloResource.java index 3384e94e8ed13..5c62524d824b7 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/runner/src/main/java/org/acme/rest/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/runner/src/main/java/org/acme/rest/HelloResource.java @@ -4,11 +4,11 @@ import org.acme.level2.submodule.Level2Service; import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/app") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/HelloResource.java index b91f303d7d578..30db1cbbe8e60 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/SomeBean.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/SomeBean.java index 9129b4e86aebd..f1515d475fa1b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/SomeBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/rest/src/main/java/org/acme/SomeBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SomeBean { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/HelloResource.java index 94d1aad900334..aee10b05cf075 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-root-no-src/rest/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/HelloResource.java index a7dc81de2a568..3ad6dbddc9a5e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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 java.io.IOException; import java.net.URL; import java.util.Enumeration; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/rest/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/src/main/java/org/acme/HelloResource.java index 30a1efa26ccfd..7a12688ec12f4 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/native-image-app/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/src/main/java/org/acme/HelloResource.java index b3844301b75e3..28567d6209522 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/no-resource-root/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java index 01fc40fe4e929..a5d36dd491384 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java @@ -1,10 +1,10 @@ package org.acme.quarkus.sample; -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.acme.quarkus.sample.extension.ConfigReport; @@ -19,4 +19,4 @@ public class HelloResource { public String hello() { return "builder-image is " + configReport.builderImage; } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java index b42e6c0676823..4803735eb4a7a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java @@ -1,6 +1,6 @@ package org.acme.quarkus.sample.extension.deployment; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.acme.quarkus.sample.extension.ConfigReport; import org.acme.quarkus.sample.extension.ConfigReportRecorder; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common-transitive/src/main/java/org/acme/CommonTransitiveBean.java b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common-transitive/src/main/java/org/acme/CommonTransitiveBean.java index f33274fbbfa44..85883cb13572a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common-transitive/src/main/java/org/acme/CommonTransitiveBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common-transitive/src/main/java/org/acme/CommonTransitiveBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CommonTransitiveBean { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common/src/main/java/org/acme/CommonBean.java b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common/src/main/java/org/acme/CommonBean.java index 4ac3b14759907..8dd748be19a5b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common/src/main/java/org/acme/CommonBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/common/src/main/java/org/acme/CommonBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CommonBean { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/library/src/main/java/org/acme/LibraryBean.java b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/library/src/main/java/org/acme/LibraryBean.java index 41035a80204bb..7e801d7ef8f5c 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/library/src/main/java/org/acme/LibraryBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/library/src/main/java/org/acme/LibraryBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LibraryBean { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/deployment/src/main/java/org/acme/quarkus/ext/deployment/AcmeQuarkusExtProcessor.java b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/deployment/src/main/java/org/acme/quarkus/ext/deployment/AcmeQuarkusExtProcessor.java index 7723e112b407d..4a7796ff45ec4 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/deployment/src/main/java/org/acme/quarkus/ext/deployment/AcmeQuarkusExtProcessor.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/quarkus-ext/deployment/src/main/java/org/acme/quarkus/ext/deployment/AcmeQuarkusExtProcessor.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; import io.quarkus.deployment.annotations.BuildStep; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/HelloResource.java index 9458c5c27079f..e4bb827f2625a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/HelloResource.java @@ -3,11 +3,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/runner/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/HelloResource.java index b59ceab007ad7..225f8aeef5823 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") @Produces(MediaType.TEXT_PLAIN) diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/property-expansion/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/HelloResource.java index 94d1aad900334..aee10b05cf075 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/local-dep/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/src/main/java/org/acme/HelloResource.java index a17698bd7f374..6a1dcd41b27e6 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/proto-gen/src/main/java/org/acme/HelloResource.java @@ -2,8 +2,8 @@ import com.example.SimpleOuterClass.Msg; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/library/src/main/java/org/acme/SomeBean.java b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/library/src/main/java/org/acme/SomeBean.java index 8d0fe720363d5..31efa684f8476 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/library/src/main/java/org/acme/SomeBean.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/library/src/main/java/org/acme/SomeBean.java @@ -1,6 +1,6 @@ package org.acme; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SomeBean { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/HelloResource.java index e46d2196a244d..4e6d560896d94 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/runner/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java index 42203e0efd1f5..b66c0fde53e15 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java @@ -1,10 +1,10 @@ package org.acme; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java index b7e0454e9126d..bf6cd5d83e3bb 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java @@ -1,6 +1,6 @@ package org.acme.reactive.routes; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.netty.util.Version; import io.quarkus.vertx.web.Route; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java index 1e4c376525bba..8862e64adbdaa 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java @@ -1,7 +1,7 @@ package org.acme.reactive.routes; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.filters.Filters; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java index 312dd854f53b6..20b2e10403925 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Singleton diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java index 007ff31e966c7..17314a7435eb0 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.inject.Singleton; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.ext.Provider; @Provider @Singleton diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java index cf0fa28643af6..4b07b6094f676 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java @@ -1,8 +1,8 @@ package org.acme; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/downstream") public class DownstreamService { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java index cb7593fc50209..658a3f094f98a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.acme.CustomHeader1; import org.acme.CustomHeader2; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java index 640c18524440e..1bfbd3242b48d 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java @@ -1,8 +1,8 @@ package org.acme; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java index e05e3fc81410a..fbb27b57b28fc 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java index 031f2d10eb40e..5a0d7d9a7d7f1 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java @@ -2,10 +2,10 @@ import org.apache.commons.io.IOUtils; -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 java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java index 4b26e9a74e6ec..c21e5305ea793 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java index 1ff398c3bc262..36cfbe3d82e5e 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java @@ -2,8 +2,8 @@ import org.apache.commons.io.IOUtils; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/src/main/java/org/acme/quarkus/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/src/main/java/org/acme/quarkus/HelloResource.java index d7f8dce0e8d6d..b4c8080e9c8ca 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/src/main/java/org/acme/quarkus/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/app/src/main/java/org/acme/quarkus/HelloResource.java @@ -1,9 +1,9 @@ package org.acme.quarkus; -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 HelloResource { @@ -21,4 +21,4 @@ public String hello() throws ClassNotFoundException { Class.forName("org.acme.AcmeCommon"); return "Test class is not visible"; } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/src/main/java/org/acme/GreetingResource.java b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/src/main/java/org/acme/GreetingResource.java index 774b1a8b4307d..01d99524d6e6a 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/src/main/java/org/acme/GreetingResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/runner/src/main/java/org/acme/GreetingResource.java @@ -3,10 +3,10 @@ import java.net.URL; import java.util.Enumeration; -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 GreetingResource { @@ -40,4 +40,4 @@ private String getNextModuleName(final Enumeration en) { s = s.substring(s.lastIndexOf('/') + 1); return s; } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/src/main/java/org/acme/GreetingResource.java b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/src/main/java/org/acme/GreetingResource.java index a3b68994dfaa1..75d2661bf108b 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/src/main/java/org/acme/GreetingResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/src/main/java/org/acme/GreetingResource.java @@ -1,9 +1,9 @@ package org.acme; -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 GreetingResource { @@ -15,4 +15,4 @@ public class GreetingResource { public String hello() { return HELLO; } -} \ No newline at end of file +} diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/HelloResource.java index 793e59bb74c60..79164112da29c 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/HelloResource.java @@ -2,11 +2,11 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -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("/hello") public class HelloResource { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/MyApplication.java index 2b41cd0385afb..a6d66f8b9eda2 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/MyApplication.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-check/src/main/java/org/acme/MyApplication.java @@ -1,7 +1,7 @@ package org.acme; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/app") public class MyApplication extends Application { diff --git a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java index e05e3fc81410a..fbb27b57b28fc 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java +++ b/integration-tests/maven/src/test/resources-filtered/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java @@ -1,9 +1,9 @@ package org.acme; -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 HelloResource { diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java index e6f726a311c60..c635851a2dc80 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java @@ -1,6 +1,6 @@ package io.quarkus.it.micrometer.mpmetrics; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java index ecebb9e689928..745d779b53088 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java @@ -2,9 +2,9 @@ import java.util.Random; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Gauge; diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java index 5c72e4b60a958..2105c7ef33831 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.micrometer.mpmetrics; -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.micrometer.core.instrument.MeterRegistry; diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java index 0545b7477f94d..ef648c6d903cc 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.atomic.LongAccumulator; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.*; diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java index 1e921284f8116..e6005d21b273f 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Tag; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/ExporterResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/ExporterResource.java index c6fe0b23d6174..ee124ec5e8d05 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/ExporterResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/ExporterResource.java @@ -1,12 +1,12 @@ package io.quarkus; -import javax.enterprise.context.ApplicationScoped; -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.enterprise.context.ApplicationScoped; +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; import io.micrometer.core.instrument.search.Search; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/doc/micrometer/ExampleResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/doc/micrometer/ExampleResource.java index f66df272b1d5e..d17ec50ddbdbb 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/doc/micrometer/ExampleResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/doc/micrometer/ExampleResource.java @@ -13,10 +13,10 @@ import java.util.LinkedList; import java.util.NoSuchElementException; -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.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java index 50f9d6901c370..5d9d67c2eaef8 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java @@ -5,8 +5,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.jboss.logging.Logger; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java index 649e7966c6381..6d0158e45c44f 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java @@ -2,10 +2,10 @@ import java.util.Arrays; -import javax.annotation.Priority; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java index cd4f186c0280a..04a4c251cebc0 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.it.micrometer.prometheus; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java index 3a1b74739da00..4227515888079 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.hibernate.orm.panache.PanacheQuery; import io.smallrye.common.annotation.Blocking; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java index 93f87cefe5232..5d8da5a86de33 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.micrometer.prometheus; -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.micrometer.core.instrument.MeterRegistry; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java index 721e384a04300..f3a7e530884a5 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.micrometer.prometheus; -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("template/path/{value}") public class PathTemplateResource { diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PingPongResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PingPongResource.java index 0323aafb06116..1ac18944d00aa 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PingPongResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PingPongResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.micrometer.prometheus; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java index 53e062b6ae361..30ba97119b581 100644 --- a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java +++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java @@ -3,10 +3,10 @@ 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 jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import io.micrometer.core.instrument.MeterRegistry; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java index 5a02e74d82f2d..f39140fe5435f 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.bson.codecs.Codec; import org.bson.codecs.configuration.CodecProvider; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java index 2a9c975a04e40..c88267fea7a89 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.bson.Document; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java index b4715b8e38d08..b743257080313 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java @@ -5,13 +5,13 @@ import java.util.ArrayList; import java.util.List; -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 javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +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 jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import org.bson.Document; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java index c79b50d39e574..48204c2f616f1 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java @@ -6,9 +6,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.bson.Document; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java index d96a7ac5168ab..bee7496f10b7f 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java @@ -7,12 +7,12 @@ import java.util.ArrayList; import java.util.List; -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 javax.ws.rs.core.Response; +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 jakarta.ws.rs.core.Response; import org.bson.Document; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleCustomizer.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleCustomizer.java index 1094053967ab2..4c23742c718e1 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleCustomizer.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleCustomizer.java @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.discriminator.jsonb; -import javax.inject.Singleton; -import javax.json.bind.JsonbConfig; +import jakarta.inject.Singleton; +import jakarta.json.bind.JsonbConfig; import io.quarkus.jsonb.JsonbConfigCustomizer; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleDeserializer.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleDeserializer.java index 87339d60d68e3..8bee26f3c21c9 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleDeserializer.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/jsonb/VehicleDeserializer.java @@ -2,10 +2,10 @@ import java.lang.reflect.Type; -import javax.json.JsonObject; -import javax.json.bind.serializer.DeserializationContext; -import javax.json.bind.serializer.JsonbDeserializer; -import javax.json.stream.JsonParser; +import jakarta.json.JsonObject; +import jakarta.json.bind.serializer.DeserializationContext; +import jakarta.json.bind.serializer.JsonbDeserializer; +import jakarta.json.stream.JsonParser; import io.quarkus.it.mongodb.discriminator.Car; import io.quarkus.it.mongodb.discriminator.Moto; diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java index 2e08e0a126929..de4a3ab7f4167 100644 --- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java +++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java @@ -7,15 +7,15 @@ import java.util.ArrayList; import java.util.List; -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.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.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 jakarta.ws.rs.core.Response; import org.bson.Document; diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java index ec5eb2ec840f7..5c0bb32106da1 100644 --- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java +++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java index 69e6a8ff06317..62f40c048aec7 100644 --- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java +++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/PojoResourceTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/PojoResourceTest.java index 2c03ce679351a..3c3a232409333 100644 --- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/PojoResourceTest.java +++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/PojoResourceTest.java @@ -5,7 +5,7 @@ import java.util.Optional; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java index b9a668d21e4b0..394fcfa5dd8be 100644 --- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java +++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java @@ -6,8 +6,8 @@ import java.util.Collections; import java.util.List; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java index 5a02e74d82f2d..f39140fe5435f 100644 --- a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java +++ b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookCodecProvider.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.bson.codecs.Codec; import org.bson.codecs.configuration.CodecProvider; diff --git a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResource.java b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResource.java index 2ace7845a9407..2e17902195973 100644 --- a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResource.java +++ b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResource.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.bson.BsonObjectId; diff --git a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java index f834311622d0e..86c4194fb2e35 100644 --- a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java +++ b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java @@ -5,12 +5,12 @@ import java.util.ArrayList; 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.PathParam; -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.PathParam; +import jakarta.ws.rs.core.Response; import com.mongodb.client.FindIterable; import com.mongodb.client.MongoClient; diff --git a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java index 940e0ae46505c..77a701ff50f11 100644 --- a/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java +++ b/integration-tests/mongodb-devservices/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import io.quarkus.mongodb.reactive.ReactiveMongoClient; import io.quarkus.mongodb.reactive.ReactiveMongoCollection; diff --git a/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java b/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java index 86ba444f6f647..7d09fca5aa53c 100644 --- a/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java +++ b/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java b/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java index 69e6a8ff06317..62f40c048aec7 100644 --- a/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java +++ b/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb; -import javax.json.bind.Jsonb; +import jakarta.json.bind.Jsonb; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/Utils.java b/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/Utils.java index 726c22d22b95c..a716321a6a231 100644 --- a/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/Utils.java +++ b/integration-tests/mongodb-devservices/src/test/java/io/quarkus/it/mongodb/Utils.java @@ -6,8 +6,8 @@ import java.util.Collections; import java.util.List; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/mongodb-panache-kotlin/pom.xml b/integration-tests/mongodb-panache-kotlin/pom.xml index b1b0a6d6a3de6..4a87c0a92718a 100644 --- a/integration-tests/mongodb-panache-kotlin/pom.xml +++ b/integration-tests/mongodb-panache-kotlin/pom.xml @@ -175,7 +175,7 @@ all-open - + diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt index 38cd2da07f6e2..43b806d780e5e 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt @@ -2,21 +2,21 @@ package io.quarkus.it.mongodb.panache.book import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort +import jakarta.annotation.PostConstruct +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.NotFoundException +import jakarta.ws.rs.PATCH +import jakarta.ws.rs.POST +import jakarta.ws.rs.PUT +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.QueryParam +import jakarta.ws.rs.core.Response import org.bson.types.ObjectId import org.jboss.logging.Logger import java.net.URI import java.time.LocalDate -import javax.annotation.PostConstruct -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.NotFoundException -import javax.ws.rs.PATCH -import javax.ws.rs.POST -import javax.ws.rs.PUT -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.QueryParam -import javax.ws.rs.core.Response @Path("/books/entity") class BookEntityResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt index 30e6438eac573..612f0952d3f2b 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.book import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class BookRepository(private val dummyService: DummyService) : PanacheMongoRepository diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt index 50c5400eb5d2e..5be8c8226c4c7 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt @@ -2,22 +2,22 @@ package io.quarkus.it.mongodb.panache.book import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort +import jakarta.annotation.PostConstruct +import jakarta.inject.Inject +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.NotFoundException +import jakarta.ws.rs.PATCH +import jakarta.ws.rs.POST +import jakarta.ws.rs.PUT +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.QueryParam +import jakarta.ws.rs.core.Response import org.bson.types.ObjectId import org.jboss.logging.Logger import java.net.URI import java.time.LocalDate -import javax.annotation.PostConstruct -import javax.inject.Inject -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.NotFoundException -import javax.ws.rs.PATCH -import javax.ws.rs.POST -import javax.ws.rs.PUT -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.QueryParam -import javax.ws.rs.core.Response @Path("/books/repository") class BookRepositoryResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/DummyService.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/DummyService.kt index 7ce0f6fb34e81..ba04a68d09f37 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/DummyService.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/DummyService.kt @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.book -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped // used only to validate that we can inject CDI beans into Panache repositories written in Kotlin @ApplicationScoped diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt index 7989d22d23cc7..c42e2368a556d 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.bugs import io.quarkus.it.mongodb.panache.book.Book -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class Bug5274EntityRepository : AbstractRepository() diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt index ee3bcc51ef5d7..9b2addac5307e 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.bugs import io.quarkus.it.mongodb.panache.person.PersonEntity -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class Bug5885EntityRepository : Bug5885AbstractRepository() diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt index b0c83f159006d..2af59abc273cb 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.bugs -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class Bug6324ConcreteRepository : Bug6324AbstractRepository() diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt index db4075f439a59..fd6bffbe97712 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.bugs import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class Bug6324Repository : PanacheMongoRepository diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt index 1024fbe4b3567..321aa8c371e41 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt @@ -1,18 +1,18 @@ package io.quarkus.it.mongodb.panache.bugs +import jakarta.inject.Inject +import jakarta.ws.rs.Consumes +import jakarta.ws.rs.GET +import jakarta.ws.rs.NotFoundException +import jakarta.ws.rs.Path +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.Response import java.time.Instant import java.time.LocalDate import java.time.LocalDateTime import java.time.temporal.ChronoUnit import java.util.Date -import javax.inject.Inject -import javax.ws.rs.Consumes -import javax.ws.rs.GET -import javax.ws.rs.NotFoundException -import javax.ws.rs.Path -import javax.ws.rs.Produces -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.Response @Path("/bugs") @Produces(MediaType.TEXT_PLAIN) diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt index fdcd85abd841e..308a2e2b082b1 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt @@ -2,7 +2,7 @@ package io.quarkus.it.mongodb.panache.person import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase import io.quarkus.panache.common.Sort -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped open class MockablePersonRepository : PanacheMongoRepositoryBase { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt index 49d4c0ed6d3a9..f6d404d4a3081 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.person import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class PersonRepository : PanacheMongoRepositoryBase diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt index 4e46fba760b13..69766b7937a5b 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt @@ -5,16 +5,16 @@ import io.quarkus.it.mongodb.panache.person.PersonEntity import io.quarkus.it.mongodb.panache.person.PersonName import io.quarkus.it.mongodb.panache.person.Status import io.quarkus.panache.common.Sort +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.PATCH +import jakarta.ws.rs.POST +import jakarta.ws.rs.PUT +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.QueryParam +import jakarta.ws.rs.core.Response import java.net.URI -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.PATCH -import javax.ws.rs.POST -import javax.ws.rs.PUT -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.QueryParam -import javax.ws.rs.core.Response @Path("/persons/entity") class PersonEntityResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt index 8349cb4df6ca7..6a8c63c312e89 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt @@ -7,17 +7,17 @@ import io.quarkus.it.mongodb.panache.person.PersonName import io.quarkus.it.mongodb.panache.person.PersonRepository import io.quarkus.it.mongodb.panache.person.Status import io.quarkus.panache.common.Sort +import jakarta.inject.Inject +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.PATCH +import jakarta.ws.rs.POST +import jakarta.ws.rs.PUT +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.QueryParam +import jakarta.ws.rs.core.Response import java.net.URI -import javax.inject.Inject -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.PATCH -import javax.ws.rs.POST -import javax.ws.rs.PUT -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.QueryParam -import javax.ws.rs.core.Response @Path("/persons/repository") class PersonRepositoryResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt index a381eb6f59342..9984585251220 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt @@ -3,25 +3,25 @@ package io.quarkus.it.mongodb.panache.reactive.book import io.quarkus.panache.common.Parameters.with import io.quarkus.panache.common.Sort import io.smallrye.mutiny.Uni +import jakarta.annotation.PostConstruct +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.NotFoundException +import jakarta.ws.rs.PATCH +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.bson.types.ObjectId import org.jboss.logging.Logger import org.jboss.resteasy.reactive.RestStreamElementType -import org.reactivestreams.Publisher import java.net.URI import java.time.LocalDate.parse -import javax.annotation.PostConstruct -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.NotFoundException -import javax.ws.rs.PATCH -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 java.util.concurrent.Flow @Path("/reactive/books/entity") class ReactiveBookEntityResource { @@ -43,7 +43,7 @@ class ReactiveBookEntityResource { @Path("/stream") @Produces(MediaType.SERVER_SENT_EVENTS) @RestStreamElementType(MediaType.APPLICATION_JSON) - fun streamBooks(@QueryParam("sort") sort: String?): Publisher { + fun streamBooks(@QueryParam("sort") sort: String?): Flow.Publisher { return if (sort != null) { ReactiveBookEntity.streamAll(Sort.ascending(sort)) } else ReactiveBookEntity.streamAll() diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt index 59f62d1f04888..2fa59a440a7e4 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt @@ -2,7 +2,7 @@ package io.quarkus.it.mongodb.panache.reactive.book import io.quarkus.it.mongodb.panache.book.Book import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class ReactiveBookRepository : ReactivePanacheMongoRepository diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt index faa04231dde2a..bdd3f2baa8c0c 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt @@ -4,26 +4,26 @@ import io.quarkus.it.mongodb.panache.book.Book import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort import io.smallrye.mutiny.Uni +import jakarta.annotation.PostConstruct +import jakarta.inject.Inject +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.NotFoundException +import jakarta.ws.rs.PATCH +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.bson.types.ObjectId import org.jboss.logging.Logger import org.jboss.resteasy.reactive.RestStreamElementType -import org.reactivestreams.Publisher import java.net.URI import java.time.LocalDate -import javax.annotation.PostConstruct -import javax.inject.Inject -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.NotFoundException -import javax.ws.rs.PATCH -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 java.util.concurrent.Flow @Path("/reactive/books/repository") class ReactiveBookRepositoryResource { @@ -48,7 +48,7 @@ class ReactiveBookRepositoryResource { @Path("/stream") @Produces(MediaType.SERVER_SENT_EVENTS) @RestStreamElementType(MediaType.APPLICATION_JSON) - fun streamBooks(@QueryParam("sort") sort: String?): Publisher { + fun streamBooks(@QueryParam("sort") sort: String?): Flow.Publisher { return if (sort != null) { reactiveBookRepository.streamAll(Sort.ascending(sort)) } else reactiveBookRepository.streamAll() diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt index 8817a989b43fb..00c3ed0a45d00 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt @@ -2,7 +2,7 @@ package io.quarkus.it.mongodb.panache.reactive.person import io.quarkus.it.mongodb.panache.person.Person import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepositoryBase -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class ReactivePersonRepository : ReactivePanacheMongoRepositoryBase diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt index 855f471d40711..a8a08e98c23c2 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt @@ -5,16 +5,16 @@ import io.quarkus.it.mongodb.panache.person.PersonName import io.quarkus.it.mongodb.panache.reactive.person.ReactivePersonEntity import io.quarkus.panache.common.Sort import io.smallrye.mutiny.Uni +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.PATCH +import jakarta.ws.rs.POST +import jakarta.ws.rs.PUT +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.QueryParam +import jakarta.ws.rs.core.Response import java.net.URI -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.PATCH -import javax.ws.rs.POST -import javax.ws.rs.PUT -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.QueryParam -import javax.ws.rs.core.Response @Path("/reactive/persons/entity") class ReactivePersonEntityResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt index 991df718fd213..0c2d38714ae24 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt @@ -6,17 +6,17 @@ import io.quarkus.it.mongodb.panache.person.PersonName import io.quarkus.it.mongodb.panache.reactive.person.ReactivePersonRepository import io.quarkus.panache.common.Sort import io.smallrye.mutiny.Uni +import jakarta.inject.Inject +import jakarta.ws.rs.DELETE +import jakarta.ws.rs.GET +import jakarta.ws.rs.PATCH +import jakarta.ws.rs.POST +import jakarta.ws.rs.PUT +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.QueryParam +import jakarta.ws.rs.core.Response import java.net.URI -import javax.inject.Inject -import javax.ws.rs.DELETE -import javax.ws.rs.GET -import javax.ws.rs.PATCH -import javax.ws.rs.POST -import javax.ws.rs.PUT -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.QueryParam -import javax.ws.rs.core.Response @Path("/reactive/persons/repository") class ReactivePersonRepositoryResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt index bb898e05c052f..f5dad3fe53dfb 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.test import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class TestImperativeRepository : PanacheMongoRepository diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt index 0ee3d496bf402..ad4510a404e4a 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt @@ -1,7 +1,7 @@ package io.quarkus.it.mongodb.panache.test import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepository -import javax.enterprise.context.ApplicationScoped +import jakarta.enterprise.context.ApplicationScoped @ApplicationScoped class TestReactiveRepository : ReactivePanacheMongoRepository diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt index 16faeac99b4a9..65ce467fce97a 100644 --- a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt +++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt @@ -8,12 +8,12 @@ import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheQuery import io.quarkus.panache.common.Page import io.quarkus.panache.common.Parameters import io.quarkus.panache.common.Sort +import jakarta.inject.Inject +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.core.Response import org.bson.Document import org.junit.jupiter.api.Assertions -import javax.inject.Inject -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.core.Response @Path("/test") class TestResource { diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt index 617e03d38024c..755366649616a 100644 --- a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt +++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt @@ -7,14 +7,14 @@ import io.quarkus.it.mongodb.panache.person.PersonRepository import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase import io.quarkus.test.junit.QuarkusTest import io.quarkus.test.junit.mockito.InjectMock +import jakarta.inject.Inject +import jakarta.ws.rs.WebApplicationException import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test import org.junit.jupiter.api.condition.DisabledOnOs import org.junit.jupiter.api.condition.OS import org.mockito.Mockito import java.util.Collections -import javax.inject.Inject -import javax.ws.rs.WebApplicationException @QuarkusTest @DisabledOnOs(OS.WINDOWS) diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt index 7b5c7927528fa..a1933ff98170b 100644 --- a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt +++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt @@ -16,6 +16,10 @@ import io.restassured.common.mapper.TypeRef import io.restassured.config.ObjectMapperConfig import io.restassured.parsing.Parser import io.restassured.response.Response +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.awaitility.Awaitility.await import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals @@ -30,10 +34,6 @@ import java.util.Collections import java.util.Date import java.util.GregorianCalendar import java.util.concurrent.atomic.LongAdder -import javax.ws.rs.client.Client -import javax.ws.rs.client.ClientBuilder -import javax.ws.rs.client.WebTarget -import javax.ws.rs.sse.SseEventSource @QuarkusTest @QuarkusTestResource(MongoTestResource::class) diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java index adedbb1e53de4..c688fe270ae4e 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java index f98d16594b2b9..127659b3179d3 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java @@ -4,9 +4,9 @@ import java.time.LocalDate; import java.util.List; -import javax.annotation.PostConstruct; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.bson.types.ObjectId; import org.jboss.logging.Logger; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepository.java index d7f35d2a2b25b..3f7e67af2d4f9 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.book; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepository; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java index a0dd6d7549231..16705ac803f0e 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java @@ -4,10 +4,10 @@ import java.time.LocalDate; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import org.bson.types.ObjectId; import org.jboss.logging.Logger; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java index 3ec61ddce60f8..2fe03d9b74598 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.bugs; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepository; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.java index efd37cfa9ce77..cdb6d8f909279 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.bugs; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.it.mongodb.panache.book.Book; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.java index bb9642055fa40..e226ae00e3171 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.bugs; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.it.mongodb.panache.person.PersonEntity; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.java index 06d0c917d3875..54ffdc0dd6657 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.bugs; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Bug6324ConcreteRepository extends Bug6324AbstractRepository { diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.java index 2a8301fc33f22..a2d40dbb54082 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.bugs; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepository; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java index 5c8552b52614b..823748b16b5fd 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java @@ -7,15 +7,15 @@ import java.util.Date; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -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.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.bson.Document; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.java index 51d645b204e97..86394b7d85251 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase; import io.quarkus.panache.common.Sort; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepository.java index be813d2256439..f7ce02bf4dfa6 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.person; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java index 44903f875df34..982a0625c35f3 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import com.mongodb.ReadPreference; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java index 3d0219aa63a5d..5f93e582085e9 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import com.mongodb.ReadPreference; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java index 3ca75ea134912..eddd1391f6189 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java @@ -3,16 +3,16 @@ import java.net.URI; import java.time.LocalDate; import java.util.List; +import java.util.concurrent.Flow; -import javax.annotation.PostConstruct; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.bson.types.ObjectId; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestStreamElementType; -import org.reactivestreams.Publisher; import io.quarkus.panache.common.Parameters; import io.quarkus.panache.common.Sort; @@ -41,7 +41,7 @@ public Uni> getBooks(@QueryParam("sort") String sort) { @Path("/stream") @Produces(MediaType.SERVER_SENT_EVENTS) @RestStreamElementType(MediaType.APPLICATION_JSON) - public Publisher streamBooks(@QueryParam("sort") String sort) { + public Flow.Publisher streamBooks(@QueryParam("sort") String sort) { if (sort != null) { return ReactiveBookEntity.streamAll(Sort.ascending(sort)); } diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.java index 7cb283d7ca032..50e91b889b26b 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.reactive.book; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.it.mongodb.panache.book.Book; import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java index 25e21f975d6d4..96e21828edc16 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java @@ -3,17 +3,17 @@ import java.net.URI; import java.time.LocalDate; import java.util.List; +import java.util.concurrent.Flow; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.bson.types.ObjectId; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.RestStreamElementType; -import org.reactivestreams.Publisher; import io.quarkus.it.mongodb.panache.book.Book; import io.quarkus.panache.common.Parameters; @@ -45,7 +45,7 @@ public Uni> getBooks(@QueryParam("sort") String sort) { @Path("/stream") @Produces(MediaType.SERVER_SENT_EVENTS) @RestStreamElementType(MediaType.APPLICATION_JSON) - public Publisher streamBooks(@QueryParam("sort") String sort) { + public Flow.Publisher streamBooks(@QueryParam("sort") String sort) { if (sort != null) { return reactiveBookRepository.streamAll(Sort.ascending(sort)); } diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/MockableReactivePersonRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/MockableReactivePersonRepository.java index 29938807f6110..6108d38c5d6f6 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/MockableReactivePersonRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/MockableReactivePersonRepository.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase; import io.quarkus.panache.common.Sort; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.java index 01054e26b910a..50da35483b9f9 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.reactive.person; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.it.mongodb.panache.person.Person; import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java index dbd1a9bac4724..f8f4593902137 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import com.mongodb.ReadPreference; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java index aea4dad507f2e..44aa88ed16508 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import com.mongodb.ReadPreference; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.java index 60e9b609b00e8..b4cf27d846a15 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepository; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.java index ce649eafea298..9c22c7921fcd9 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.panache.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java index ffd7fd3040025..5a5aa17920b7d 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java @@ -3,10 +3,10 @@ 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.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.bson.Document; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/transaction/TransactionPersonResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/transaction/TransactionPersonResource.java index 4de21c0a970ba..27763f671c453 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/transaction/TransactionPersonResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/transaction/TransactionPersonResource.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.inject.Named; -import javax.transaction.Transactional; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.mongodb.client.MongoClient; diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java index c60e796931612..7000625e4c6d7 100644 --- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java +++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java @@ -3,8 +3,8 @@ import java.util.Collections; import java.util.Optional; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Order; diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheMockingTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheMockingTest.java index dac1559ba2d0c..cfa5996b0b9a7 100644 --- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheMockingTest.java +++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheMockingTest.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.WebApplicationException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Order; diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java index 5aaa63a435579..91eed8103c5c4 100644 --- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java +++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java @@ -16,10 +16,10 @@ import java.util.List; import java.util.concurrent.atomic.LongAdder; -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.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java index 71edcb3389ec3..c190584425715 100644 --- a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java +++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java @@ -1,6 +1,6 @@ package io.quarkus.it.mongodb.rest.data.panache; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase; diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java index c8238f6b178a5..27e6395eab89a 100644 --- a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java +++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.mongodb.rest.data.panache; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @ApplicationScoped @Path("/test") diff --git a/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java index b8e149737685f..e2bd73c7c5ca0 100644 --- a/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java +++ b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java @@ -5,9 +5,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.*; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.core.MediaType; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java index 1ac904116b787..f59bd0134e552 100644 --- a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java +++ b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java @@ -1,22 +1,22 @@ package io.quarkus.narayana.jta; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.Destroyed; -import javax.enterprise.context.Initialized; -import javax.enterprise.context.spi.Context; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.TransactionScoped; -import javax.transaction.Transactional; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.BeforeDestroyed; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.enterprise.context.Destroyed; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionScoped; +import jakarta.transaction.Transactional; +import jakarta.transaction.UserTransaction; import org.jboss.logging.Logger; diff --git a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java index 2ebbe16150daa..56821230ff932 100644 --- a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java +++ b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicInteger; -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 TransactionScopedBean { diff --git a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java index b9f7f447efa4e..db3d2fc174529 100644 --- a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java +++ b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java @@ -1,13 +1,13 @@ package io.quarkus.narayana.jta; -import javax.inject.Inject; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -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.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/tx") public class TransactionalResource { @@ -18,7 +18,7 @@ public class TransactionalResource { @GET @Produces(MediaType.TEXT_PLAIN) @Transactional - public String status() throws javax.transaction.SystemException { + public String status() throws jakarta.transaction.SystemException { Transaction txn = tm.getTransaction(); return String.valueOf(txn.getStatus()); } diff --git a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java index 140825a7d144b..daa221f2986b1 100644 --- a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java +++ b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java @@ -4,12 +4,13 @@ import java.io.File; -import javax.inject.Inject; -import javax.transaction.TransactionManager; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import jakarta.inject.Inject; +import jakarta.transaction.TransactionManager; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java index 0c4897dde9f70..f726e27c1d851 100644 --- a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java +++ b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.enterprise.context.ContextNotActiveException; -import javax.inject.Inject; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.ContextNotActiveException; +import jakarta.inject.Inject; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.Test; diff --git a/integration-tests/narayana-lra/src/main/java/org/acme/quickstart/lra/coordinator/TransactionalResource.java b/integration-tests/narayana-lra/src/main/java/org/acme/quickstart/lra/coordinator/TransactionalResource.java index 4fe9f0a6c9419..e0d8b1ba9f25a 100644 --- a/integration-tests/narayana-lra/src/main/java/org/acme/quickstart/lra/coordinator/TransactionalResource.java +++ b/integration-tests/narayana-lra/src/main/java/org/acme/quickstart/lra/coordinator/TransactionalResource.java @@ -5,12 +5,12 @@ import java.net.URI; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.lra.annotation.Compensate; import org.eclipse.microprofile.lra.annotation.Complete; diff --git a/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightResource.java b/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightResource.java index 7e65d2ab46e80..0a5a0aef651cc 100644 --- a/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightResource.java +++ b/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightResource.java @@ -3,13 +3,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.enterprise.context.RequestScoped; -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 jakarta.enterprise.context.RequestScoped; +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; @Path("/stm") @RequestScoped diff --git a/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightServiceFactory.java b/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightServiceFactory.java index b1b7af50bbce1..fee5e1ac1a1e0 100644 --- a/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightServiceFactory.java +++ b/integration-tests/narayana-stm/src/main/java/org/acme/quickstart/stm/FlightServiceFactory.java @@ -1,6 +1,6 @@ package org.acme.quickstart.stm; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.jboss.stm.Container; diff --git a/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java index 37830301fc47b..9a72c5a61826e 100644 --- a/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java +++ b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.nat.test.profile; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java index 1f2e302b1af74..0f88b3b8d4e25 100644 --- a/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java +++ b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java @@ -1,6 +1,6 @@ package io.quarkus.it.nat.test.profile; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class UnusedRemovableBean { diff --git a/integration-tests/no-awt/src/main/java/io/quarkus/awt/it/GraphicsResource.java b/integration-tests/no-awt/src/main/java/io/quarkus/awt/it/GraphicsResource.java index 0aebdecc335e0..e2c9356774954 100644 --- a/integration-tests/no-awt/src/main/java/io/quarkus/awt/it/GraphicsResource.java +++ b/integration-tests/no-awt/src/main/java/io/quarkus/awt/it/GraphicsResource.java @@ -17,10 +17,11 @@ import javax.imageio.ImageWriter; import javax.imageio.spi.IIORegistry; import javax.imageio.spi.ImageReaderSpi; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; diff --git a/integration-tests/oidc-client-reactive/pom.xml b/integration-tests/oidc-client-reactive/pom.xml index 86a8bb7f78977..00b772c39d080 100644 --- a/integration-tests/oidc-client-reactive/pom.xml +++ b/integration-tests/oidc-client-reactive/pom.xml @@ -34,8 +34,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java index 835ad9c17691d..0726cbbe8cffa 100644 --- a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java +++ b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java index 04147c6992e15..90c594f2d3850 100644 --- a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java +++ b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java @@ -2,10 +2,10 @@ import java.util.function.Consumer; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.spi.ResteasyReactiveClientRequestContext; diff --git a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index d22677cb03e7c..6364968ad289e 100644 --- a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -2,11 +2,11 @@ import java.security.Principal; -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 jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.security.Authenticated; diff --git a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceCustomFilter.java b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceCustomFilter.java index e17ec8fb4fc61..cfb95ea71c0e1 100644 --- a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceCustomFilter.java +++ b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceCustomFilter.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedFilter.java b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedFilter.java index 04d703f5d5f39..4edcce384a808 100644 --- a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedFilter.java +++ b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedFilter.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceReactiveFilter.java b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceReactiveFilter.java index 2aa9c88e12ebc..10e9ce803e2b2 100644 --- a/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceReactiveFilter.java +++ b/integration-tests/oidc-client-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceReactiveFilter.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java index a6f9062049194..2dee384ad1079 100644 --- a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java +++ b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.keycloak; -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.WebApplicationException; +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.WebApplicationException; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index 7c9316864eda9..d6042dd4c83b4 100644 --- a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; @Path("/protected") public class ProtectedResource { diff --git a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java index d2726065eeea1..8688cc6314369 100644 --- a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java +++ b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java index fceb9735d12f4..b89c36053549f 100644 --- a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java +++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; diff --git a/integration-tests/oidc-client/pom.xml b/integration-tests/oidc-client/pom.xml index 1bd735aa1c17f..27039ffc402ec 100644 --- a/integration-tests/oidc-client/pom.xml +++ b/integration-tests/oidc-client/pom.xml @@ -35,8 +35,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java index de5fe9f39ee15..59fc418d5e1a3 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java index 47778f817b43c..240026b074dd7 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/OidcClientRequestCustomFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.ws.rs.Priorities; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; import io.quarkus.oidc.client.NamedOidcClient; import io.quarkus.oidc.client.Tokens; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index b99056445fdee..0c77cde1cf095 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -2,10 +2,10 @@ import java.security.Principal; -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.Authenticated; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedOidcClient.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedOidcClient.java index 59fc09ae12cfb..a334e445b0715 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedOidcClient.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNamedOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java index 8e078666a40f4..5ba8e87679916 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNonDefaultOidcClient.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNonDefaultOidcClient.java index 676632398d3a1..d72493e056fb7 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNonDefaultOidcClient.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNonDefaultOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java index 3cedc0b77aacb..cbae73d9a251f 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java index d51c52d398d76..e23cc87d4df33 100644 --- a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java +++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml index dbfd44d2741aa..44b0a5be19815 100644 --- a/integration-tests/oidc-code-flow/pom.xml +++ b/integration-tests/oidc-code-flow/pom.xml @@ -67,8 +67,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation io.rest-assured diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/AuthenticationCompletionExceptionMapper.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/AuthenticationCompletionExceptionMapper.java index 7137892a31451..e3ceb9667dd90 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/AuthenticationCompletionExceptionMapper.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/AuthenticationCompletionExceptionMapper.java @@ -1,12 +1,12 @@ package io.quarkus.it.keycloak; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import io.quarkus.security.AuthenticationCompletionException; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java index b7bd89c6ddf8e..27ebcb4c8ae8e 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.AccessTokenCredential; import io.quarkus.oidc.IdTokenCredential; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java index 728d304a44297..22f5f2e4caf1f 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java index 44b184c5430e0..23f7cb1c5183f 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.quarkus.oidc.runtime.OidcUtils; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index 2bac753ec2c0b..03078e42e591e 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -3,14 +3,14 @@ import java.security.Principal; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.CookieParam; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.inject.Inject; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java index c848f91996016..6a2309c35dfdf 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource2.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource3.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource3.java index 161449c0a4d1e..b346cb238a51a 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource3.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource3.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.Path; import io.quarkus.security.Authenticated; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java index 1ae499b72eecc..1910f119bc3ba 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.oidc.SecurityEvent; import io.quarkus.security.identity.AuthenticationRequestContext; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java index 092d6c8b63f87..d26875d7cd143 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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.security.Authenticated; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java index f06cffa5a4699..ee5ed7044b91b 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.oidc.OidcSession; import io.quarkus.security.Authenticated; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java index 5ffabd9a6b9ea..a19f158fb7fdd 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java @@ -1,13 +1,13 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; import io.quarkus.security.Authenticated; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantRefresh.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantRefresh.java index aae7df4458b02..4ea2986944d3f 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantRefresh.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantRefresh.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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.security.Authenticated; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/UnprotectedResource.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/UnprotectedResource.java index 2bce57ef946d4..46168c0154bc6 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/UnprotectedResource.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/UnprotectedResource.java @@ -5,14 +5,14 @@ import java.util.Map; import java.util.UUID; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-tenancy/pom.xml b/integration-tests/oidc-tenancy/pom.xml index 787092a4310cf..8bc14a0320453 100644 --- a/integration-tests/oidc-tenancy/pom.xml +++ b/integration-tests/oidc-tenancy/pom.xml @@ -45,8 +45,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CacheResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CacheResource.java index a1bcca6c36718..b3ca92ba5a20b 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CacheResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CacheResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("cache") public class CacheResource { diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomIntrospectionUserInfoCache.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomIntrospectionUserInfoCache.java index 8287a1df7f2a7..90521b83c25d1 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomIntrospectionUserInfoCache.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomIntrospectionUserInfoCache.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.arc.AlternativePriority; import io.quarkus.oidc.OidcRequestContext; @@ -51,4 +51,4 @@ public int getCacheSize() { public void clearCache() { tokenCache.clearCache(); } -} \ No newline at end of file +} diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java index d5b4b5ff79818..5c8ce5297d4df 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java index 8996e244bf8ae..0d129f2274e15 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.quarkus.oidc.runtime.OidcUtils; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java index 3ab87468213a8..8a1721396fe3c 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java @@ -4,17 +4,17 @@ import java.time.Duration; import java.util.Base64; -import javax.annotation.PostConstruct; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -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.Context; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +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.Context; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.jwt.JsonWebToken; import org.jose4j.jwk.JsonWebKeySet; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/ServiceProtectedResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/ServiceProtectedResource.java index 491ae76585276..d7ca55fd2b1f0 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/ServiceProtectedResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/ServiceProtectedResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java index 002e50a4243fd..46c76c0a20c0f 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantOpaqueResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantOpaqueResource.java index f219556fd8c03..269d2b3019630 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantOpaqueResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantOpaqueResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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.oidc.AccessTokenCredential; import io.quarkus.oidc.OIDCException; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantRefreshTokenResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantRefreshTokenResource.java index dca3207a36284..5220082e75696 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantRefreshTokenResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantRefreshTokenResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java index becea4057a791..811604691668e 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.jwt.Claims; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java index 56c46efd2966c..f4431b7399e54 100644 --- a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java +++ b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java index 141cdd08449e8..3f14e32d808a3 100644 --- a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java +++ b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java index 5a96b1f14c99a..64d9d13c35a6e 100644 --- a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java +++ b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/FrontendResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.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 jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java index 791c4232fd35a..fd96c67c178ea 100644 --- a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java +++ b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; -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.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +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.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index e4afd7d8ce513..c4cf5320e129a 100644 --- a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -2,11 +2,11 @@ import java.security.Principal; -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 jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.quarkus.security.Authenticated; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ServiceWithoutToken.java b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ServiceWithoutToken.java index 9f17a394911fe..4ec72128f76ce 100644 --- a/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ServiceWithoutToken.java +++ b/integration-tests/oidc-token-propagation-reactive/src/main/java/io/quarkus/it/keycloak/ServiceWithoutToken.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-token-propagation/pom.xml b/integration-tests/oidc-token-propagation/pom.xml index ff6de6eb41699..3946dc4513eaa 100644 --- a/integration-tests/oidc-token-propagation/pom.xml +++ b/integration-tests/oidc-token-propagation/pom.xml @@ -34,8 +34,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java index 006fb46b04673..ecaa12d82de9e 100644 --- a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java +++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java index 9ca4be2daaeac..d2f06c1990951 100644 --- a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java +++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.RolesAllowed; +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/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java index c08cca9159f64..f09336e85c0ae 100644 --- a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java +++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index c8fcc1309a3a5..acbf8f0b8e92e 100644 --- a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -2,10 +2,10 @@ import java.security.Principal; -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.Authenticated; diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java index 4f1b6e176534e..aa2db770fa27c 100644 --- a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java +++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java index 2f6a683ac2e88..298096b871fd5 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.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 io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowEncryptedIdTokenResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowEncryptedIdTokenResource.java index d9d04b65e8240..9d1eb6dcabe14 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowEncryptedIdTokenResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowEncryptedIdTokenResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowFormPostResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowFormPostResource.java index 7d8663fbcb59f..e91d93c7919f2 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowFormPostResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowFormPostResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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.security.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java index 8373609910ed1..02cfca00407ff 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import io.quarkus.oidc.runtime.DefaultTokenIntrospectionUserInfoCache; import io.quarkus.security.Authenticated; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowUserInfoResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowUserInfoResource.java index 11dfe8cec7dd6..ba2f63d9911aa 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowUserInfoResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowUserInfoResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java index 84eae694557c0..d7f3f2e626aa6 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java @@ -2,7 +2,7 @@ import java.security.Principal; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.UserInfo; import io.quarkus.security.identity.AuthenticationRequestContext; @@ -39,4 +39,4 @@ public String getName() { return Uni.createFrom().item(identity); } -} \ No newline at end of file +} diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java index 9308a2eed14b4..615ed87e89670 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java @@ -3,8 +3,8 @@ import java.time.Duration; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java index 61ee4ff44d326..49d09dfb2e969 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.oidc.TenantResolver; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrInterceptor.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrInterceptor.java index 663a623f5384c..96d50aaae8ded 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrInterceptor.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrInterceptor.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import io.quarkus.oidc.runtime.OidcUtils; import io.vertx.ext.web.RoutingContext; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrTenant.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrTenant.java index 107013e67edfd..2fe22a06bdcdb 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrTenant.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/HrTenant.java @@ -2,7 +2,7 @@ import java.lang.annotation.*; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @Inherited @InterceptorBinding diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java index 4ceefd20dde24..73ad85aefb882 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.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 io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueGithubResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueGithubResource.java index db55846de3e89..67c2dae6418cf 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueGithubResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueGithubResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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.AccessTokenCredential; import io.quarkus.oidc.UserInfo; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java index c1379c5ccb968..430f4b58dcc2e 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.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 io.quarkus.it.keycloak.model.User; import io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/TenantEchoResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/TenantEchoResource.java index 3ea175bed0256..caea694dd7e8e 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/TenantEchoResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/TenantEchoResource.java @@ -5,11 +5,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.oidc.runtime.OidcUtils; import io.quarkus.security.Authenticated; diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java index 2cf682a06ec7d..3e55f570cfbe9 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.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/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecovered.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecovered.java index 48e7f0d737516..dbb0de51ca683 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecovered.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecovered.java @@ -1,11 +1,11 @@ package io.quarkus.it.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/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecoveredNoDiscovery.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecoveredNoDiscovery.java index 1b1f29f27ebf9..83e313c2b778d 100644 --- a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecoveredNoDiscovery.java +++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResourceOidcRecoveredNoDiscovery.java @@ -1,11 +1,11 @@ package io.quarkus.it.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/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml index d625e07cd8300..226501ea37986 100644 --- a/integration-tests/oidc/pom.xml +++ b/integration-tests/oidc/pom.xml @@ -43,8 +43,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation io.quarkus diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java index a5e44360fd13a..e96a2f1a7be85 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -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; import org.eclipse.microprofile.jwt.Claim; import org.eclipse.microprofile.jwt.ClaimValue; diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java index aa7859e257b27..ee48ce7ee86b3 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java @@ -1,6 +1,6 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; +import jakarta.annotation.security.RolesAllowed; @RolesAllowed("user") public class HelloResourceBase { diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java index 93b11ca35c0de..7549e32d16063 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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 interface IHelloResource { diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java index 51492856d0948..bf20b79f7ecb8 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java @@ -3,11 +3,11 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.json.JsonString; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.json.JsonString; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java index 5104bc88e8b28..bf8e0867090b1 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.keycloak; -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.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.JsonWebToken; diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/SecuredHelloWebSocket.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/SecuredHelloWebSocket.java index cd6d270ca5ee9..8040036f9f933 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/SecuredHelloWebSocket.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/SecuredHelloWebSocket.java @@ -1,10 +1,10 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.annotation.security.RolesAllowed; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; import io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java index ec9898331a7a7..a89bc9ad39ff7 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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 org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/VertxResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/VertxResource.java index 360641f94595e..6f90c4c509cb7 100644 --- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/VertxResource.java +++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/VertxResource.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser; import io.vertx.core.Handler; diff --git a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/WebsocketOidcTestCase.java b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/WebsocketOidcTestCase.java index 50a993da34439..b998d0bf7bc3b 100644 --- a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/WebsocketOidcTestCase.java +++ b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/WebsocketOidcTestCase.java @@ -6,11 +6,11 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java b/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java index c2a2196d11e7d..82392a8af0f3b 100644 --- a/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java +++ b/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java @@ -1,10 +1,10 @@ package io.quarkus.it.openshift.client; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.openshift.client.OpenShiftClient; diff --git a/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/ExporterResource.java b/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/ExporterResource.java index 52581126d61c3..2f3482ad92f57 100644 --- a/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/ExporterResource.java +++ b/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/ExporterResource.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/HelloResource.java b/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/HelloResource.java index de12c7d497320..2bf441137a79e 100644 --- a/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/HelloResource.java +++ b/integration-tests/opentelemetry-grpc/src/main/java/io/quarkus/it/opentelemetry/grpc/HelloResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.opentelemetry.grpc; -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.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java index 144bcc4911d8a..a611fda7c2c7b 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java index f6f2d8cb17d61..a8219d6cb4b62 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java @@ -2,14 +2,14 @@ import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; -import javax.ws.rs.POST; -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.context.ApplicationScoped; +import jakarta.transaction.Transactional; +import jakarta.ws.rs.POST; +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.it.opentelemetry.model.Hit; import io.quarkus.it.opentelemetry.model.db2.Db2Hit; diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/db2/Db2Hit.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/db2/Db2Hit.java index c0b6637ded50b..ffca4af9f5c50 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/db2/Db2Hit.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/db2/Db2Hit.java @@ -1,7 +1,7 @@ package io.quarkus.it.opentelemetry.model.db2; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import io.quarkus.it.opentelemetry.model.Hit; diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/mariadb/MariaDbHit.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/mariadb/MariaDbHit.java index c3d77e52cc23b..9a9740c1218ee 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/mariadb/MariaDbHit.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/mariadb/MariaDbHit.java @@ -1,7 +1,7 @@ package io.quarkus.it.opentelemetry.model.mariadb; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import io.quarkus.it.opentelemetry.model.Hit; diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/oracle/OracleHit.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/oracle/OracleHit.java index 490c7fa5cf521..6c5dee4da7ea7 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/oracle/OracleHit.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/oracle/OracleHit.java @@ -1,7 +1,7 @@ package io.quarkus.it.opentelemetry.model.oracle; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import io.quarkus.it.opentelemetry.model.Hit; diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/pg/PgHit.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/pg/PgHit.java index a79d1b79c7c4a..7e8a38355258f 100644 --- a/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/pg/PgHit.java +++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/main/java/io/quarkus/it/opentelemetry/model/pg/PgHit.java @@ -1,7 +1,7 @@ package io.quarkus.it.opentelemetry.model.pg; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import io.quarkus.it.opentelemetry.model.Hit; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java index b5d56bb3f5937..7f90c83a3bd42 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.stream.Collectors; -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.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java index b4a3303664371..d469e6f945bb8 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.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.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SpanExporterProvider.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SpanExporterProvider.java index 34575ac1259ee..37bf433e2c9eb 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SpanExporterProvider.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/SpanExporterProvider.java @@ -1,8 +1,8 @@ package io.quarkus.it.opentelemetry; -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 io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaConsumer.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaConsumer.java index 055379c24905e..8812821e38713 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaConsumer.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaConsumer.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.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaProcessor.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaProcessor.java index bf3df07174e0e..82cb3b4cee4ed 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaProcessor.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedKafkaProcessor.java @@ -1,7 +1,7 @@ package io.quarkus.it.opentelemetry; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedService.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedService.java index ea21f9747be58..98d6e23ae5b36 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedService.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/TracedService.java @@ -1,6 +1,6 @@ package io.quarkus.it.opentelemetry; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.opentelemetry.instrumentation.annotations.WithSpan; diff --git a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java index 87361a228c838..83564dfe092bb 100644 --- a/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java +++ b/integration-tests/opentelemetry-reactive-messaging/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java @@ -1,6 +1,6 @@ package io.quarkus.it.opentelemetry.output; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ExporterResource.java b/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ExporterResource.java index 36c224b509256..1a6743c956d6a 100644 --- a/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ExporterResource.java +++ b/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ExporterResource.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveResource.java b/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveResource.java index a1018019cdafd..a08c9f3fbaffc 100644 --- a/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveResource.java +++ b/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveResource.java @@ -2,11 +2,11 @@ import java.time.Duration; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.QueryParam; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveRestClient.java b/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveRestClient.java index ac0d8deb06b43..e73175cb29f3b 100644 --- a/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveRestClient.java +++ b/integration-tests/opentelemetry-reactive/src/main/java/io/quarkus/it/opentelemetry/reactive/ReactiveRestClient.java @@ -1,9 +1,9 @@ package io.quarkus.it.opentelemetry.reactive; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java b/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java index ae061e9c14292..aa6178651c306 100644 --- a/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java +++ b/integration-tests/opentelemetry-reactive/src/test/java/io/quarkus/it/opentelemetry/reactive/OpenTelemetryReactiveClientTest.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.junit.jupiter.api.AfterEach; diff --git a/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/ExporterRouter.java b/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/ExporterRouter.java index 6f52ec9e6b02f..b362633125459 100644 --- a/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/ExporterRouter.java +++ b/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/ExporterRouter.java @@ -3,11 +3,11 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -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.Singleton; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/HelloRouter.java b/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/HelloRouter.java index dcc43e29f4b3d..669b629a04221 100644 --- a/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/HelloRouter.java +++ b/integration-tests/opentelemetry-vertx/src/main/java/io/quarkus/it/opentelemetry/vertx/HelloRouter.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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 io.quarkus.runtime.StartupEvent; import io.quarkus.vertx.ConsumeEvent; diff --git a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java index cc602c44d7bd1..4717f20f7303d 100644 --- a/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java +++ b/integration-tests/opentelemetry-vertx/src/test/java/io/quarkus/it/opentelemetry/vertx/SqlClientTest.java @@ -17,9 +17,10 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; import javax.sql.DataSource; +import jakarta.inject.Inject; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java index 144bcc4911d8a..a611fda7c2c7b 100644 --- a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/ExporterResource.java @@ -3,13 +3,13 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java index 323cd0119a683..c5650e9342dd0 100644 --- a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.opentelemetry; -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("template/path/{value}") public class PathTemplateResource { diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java index af49b27dae0da..4d02a03af17e8 100644 --- a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PingPongResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.opentelemetry; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java index 25c25a1b78a83..e31106f08b29a 100644 --- a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/SimpleResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.opentelemetry; -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 org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/TracedService.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/TracedService.java index ea21f9747be58..98d6e23ae5b36 100644 --- a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/TracedService.java +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/TracedService.java @@ -1,6 +1,6 @@ package io.quarkus.it.opentelemetry; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.opentelemetry.instrumentation.annotations.WithSpan; diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java index 87361a228c838..83564dfe092bb 100644 --- a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java +++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/output/SpanDataModuleSerializer.java @@ -1,6 +1,6 @@ package io.quarkus.it.opentelemetry.output; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/util/InjectionResource.java b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/util/InjectionResource.java index 08b6b91e031ad..6b0dec71d8520 100644 --- a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/util/InjectionResource.java +++ b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/util/InjectionResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.opentelemetry.util; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java index 7fda7767a654e..019ed21c05355 100644 --- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java +++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java @@ -1,6 +1,6 @@ package io.quarkus.it.picocli; -import javax.inject.Inject; +import jakarta.inject.Inject; import picocli.CommandLine; diff --git a/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/NamedCommand.java b/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/NamedCommand.java index 15749987eb551..6a29c16f16ce4 100644 --- a/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/NamedCommand.java +++ b/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/NamedCommand.java @@ -1,6 +1,6 @@ package io.quarkus.it.picocli; -import javax.inject.Named; +import jakarta.inject.Named; import io.quarkus.picocli.runtime.annotations.TopCommand; import picocli.CommandLine; diff --git a/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/ParsedCommand.java b/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/ParsedCommand.java index 9527afe79f1bf..0746279329639 100644 --- a/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/ParsedCommand.java +++ b/integration-tests/picocli/src/main/java/io/quarkus/it/picocli/ParsedCommand.java @@ -1,6 +1,6 @@ package io.quarkus.it.picocli; -import javax.inject.Inject; +import jakarta.inject.Inject; import picocli.CommandLine; diff --git a/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestOneCommand.java b/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestOneCommand.java index d46eda86ed25a..676f225cf859c 100644 --- a/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestOneCommand.java +++ b/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestOneCommand.java @@ -2,8 +2,8 @@ import static io.quarkus.it.picocli.TestUtils.createConfig; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestParsedCommand.java b/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestParsedCommand.java index 3c546a041a41c..c1509c5a10c66 100644 --- a/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestParsedCommand.java +++ b/integration-tests/picocli/src/test/java/io/quarkus/it/picocli/TestParsedCommand.java @@ -2,8 +2,8 @@ import static io.quarkus.it.picocli.TestUtils.createConfig; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index c397a25fa1a10..0f0915c08b608 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -165,7 +165,6 @@ kafka-sasl-elytron kafka-oauth-keycloak kafka-snappy - kafka-avro kafka-avro-apicurio2 kafka-streams kafka-devservices diff --git a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/CountResource.java b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/CountResource.java index 32d377d5a4374..0dd38c82ec950 100644 --- a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/CountResource.java +++ b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/CountResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.quartz; -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/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/Counter.java b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/Counter.java index c9d0f98de80e3..25fef4e0a4961 100644 --- a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/Counter.java +++ b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/Counter.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.scheduler.Scheduled; @@ -26,4 +26,4 @@ void increment() { counter.incrementAndGet(); } -} \ No newline at end of file +} diff --git a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledMethodResource.java b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledMethodResource.java index e962c1723da5f..fbdaff06005b2 100644 --- a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledMethodResource.java +++ b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledMethodResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.quartz; -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/disabled") public class DisabledMethodResource { diff --git a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledScheduledMethods.java b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledScheduledMethods.java index 4b1b5d938925a..c2085fb2a9d11 100644 --- a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledScheduledMethods.java +++ b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/DisabledScheduledMethods.java @@ -1,6 +1,6 @@ package io.quarkus.it.quartz; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.scheduler.Scheduled; diff --git a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/FixedInstanceIdResource.java b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/FixedInstanceIdResource.java index bc88a39142e37..1325198d86020 100644 --- a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/FixedInstanceIdResource.java +++ b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/FixedInstanceIdResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.quartz; -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.quartz.Scheduler; import org.quartz.SchedulerException; diff --git a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/ManualScheduledCounter.java b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/ManualScheduledCounter.java index a04ed2cab72b1..8dc28ca77041d 100644 --- a/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/ManualScheduledCounter.java +++ b/integration-tests/quartz/src/main/java/io/quarkus/it/quartz/ManualScheduledCounter.java @@ -2,10 +2,10 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.quartz.Job; import org.quartz.JobBuilder; diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java index 9a3e5e267c754..172421e6c41d3 100644 --- a/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java +++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java @@ -1,6 +1,6 @@ package io.quarkus.it.qute; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java index 6634e32c041a4..1dac312f77533 100644 --- a/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java +++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.qute; -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.qute.CheckedTemplate; import io.quarkus.qute.TemplateInstance; diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java index 0211649c419b4..011b18256407f 100644 --- a/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java +++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java @@ -1,7 +1,7 @@ package io.quarkus.it.qute; -import javax.enterprise.event.Observes; -import javax.transaction.Transactional; +import jakarta.enterprise.event.Observes; +import jakarta.transaction.Transactional; import io.quarkus.runtime.StartupEvent; diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloResource.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloResource.java index 7f1ee14238338..e9dccc16f3348 100644 --- a/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloResource.java +++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.qute; -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.quarkus.qute.Template; import io.quarkus.qute.TemplateInstance; diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloRoutes.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloRoutes.java index b541a8cc9b0f0..38f89a9af7b84 100644 --- a/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloRoutes.java +++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/HelloRoutes.java @@ -1,6 +1,6 @@ package io.quarkus.it.qute; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.qute.Template; import io.quarkus.vertx.web.Route; diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/NotFoundExceptionMapper.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/NotFoundExceptionMapper.java index 6e0810e98fbc8..a9dc961325c78 100644 --- a/integration-tests/qute/src/main/java/io/quarkus/it/qute/NotFoundExceptionMapper.java +++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/NotFoundExceptionMapper.java @@ -1,12 +1,12 @@ package io.quarkus.it.qute; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; -import javax.ws.rs.NotFoundException; -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.NotFoundException; +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 io.quarkus.qute.Location; import io.quarkus.qute.Template; diff --git a/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java b/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java index ca4eb9f76bdb0..7044d12b806c8 100644 --- a/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java +++ b/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java @@ -1,6 +1,6 @@ package io.quarkus.it.qute; -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.containsString; import static org.hamcrest.Matchers.is; diff --git a/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java b/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java index 26c911fc5228a..54b2d9e0b8556 100644 --- a/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java +++ b/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.quarkus.reactive.datasource.ReactiveDataSource; import io.vertx.core.json.JsonArray; diff --git a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java index c0526aaefeee1..2009e12696442 100644 --- a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java +++ b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java @@ -2,9 +2,9 @@ import java.util.List; -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("/amqp") public class AmqpEndpoint { diff --git a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleManager.java b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleManager.java index 6279a6581a66a..e695a442d6f5f 100644 --- a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleManager.java +++ b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleManager.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleProducer.java b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleProducer.java index 719d42d32aa27..e1beaf4ffbe98 100644 --- a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleProducer.java +++ b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/PeopleProducer.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java index 362c837a90d7b..2a68c62574453 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java @@ -2,13 +2,13 @@ import java.util.List; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.kafka.common.TopicPartition; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java index 25ea7cffa9c99..1745f951932e2 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java @@ -4,8 +4,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.transaction.Transactional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.transaction.Transactional; import org.eclipse.microprofile.reactive.messaging.Channel; import org.eclipse.microprofile.reactive.messaging.Emitter; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/Fruit.java b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/Fruit.java index acfd1f577d564..7aa14603168c2 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/Fruit.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka.fruit; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/FruitProducer.java b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/FruitProducer.java index 0be96ac8cfe21..f3b9f9b82b04f 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/FruitProducer.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/fruit/FruitProducer.java @@ -1,9 +1,9 @@ package io.quarkus.it.kafka.fruit; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleProducer.java b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleProducer.java index 893dbbd947b0b..ff5bd26ffe4c7 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleProducer.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka.people; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleState.java b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleState.java index 7005b79c15fdb..7bc9e38a64496 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleState.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/main/java/io/quarkus/it/kafka/people/PeopleState.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka.people; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.smallrye.reactivemessaging.kafka.CheckpointEntity; diff --git a/integration-tests/reactive-messaging-hibernate-orm/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java b/integration-tests/reactive-messaging-hibernate-orm/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java index ae6f2071138f5..acad13994bca7 100644 --- a/integration-tests/reactive-messaging-hibernate-orm/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java +++ b/integration-tests/reactive-messaging-hibernate-orm/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java @@ -7,7 +7,7 @@ import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.serialization.StringDeserializer; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/Fruit.java b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/Fruit.java index 25ca313af0131..74771b43c9e75 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/Fruit.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/Fruit.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/FruitProducer.java b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/FruitProducer.java index 9921a1e2fd469..1866ccf9a915a 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/FruitProducer.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/FruitProducer.java @@ -1,9 +1,9 @@ package io.quarkus.it.kafka; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -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.core.MediaType; import org.eclipse.microprofile.reactive.messaging.Channel; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java index 391f946005f24..ece424afd29e8 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java @@ -2,12 +2,12 @@ import java.util.List; -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 org.apache.kafka.common.TopicPartition; import org.hibernate.reactive.mutiny.Mutiny; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java index 2b84ac33b9620..e916c017a691d 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java @@ -5,9 +5,9 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.control.ActivateRequestContext; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.inject.Inject; import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Message; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleProducer.java b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleProducer.java index def7dd4e0baff..e7d0ac0ca77a6 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleProducer.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleState.java b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleState.java index 326a001f6aa69..e62e5d234f47d 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleState.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/main/java/io/quarkus/it/kafka/PeopleState.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.smallrye.reactivemessaging.kafka.CheckpointEntity; diff --git a/integration-tests/reactive-messaging-hibernate-reactive/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java b/integration-tests/reactive-messaging-hibernate-reactive/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java index f36afe27411d1..0bb645727b28e 100644 --- a/integration-tests/reactive-messaging-hibernate-reactive/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java +++ b/integration-tests/reactive-messaging-hibernate-reactive/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java @@ -7,7 +7,7 @@ import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/FruitProducer.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/FruitProducer.java index ced1c6f695667..251f621733494 100644 --- a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/FruitProducer.java +++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/FruitProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java index c8cd57ccb6ac8..31658db78251e 100644 --- a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java +++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java @@ -3,12 +3,12 @@ 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.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.redis.client.RedisClientName; import io.quarkus.redis.datasource.RedisDataSource; diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java index e8622e0981ffd..5d2d35aa23144 100644 --- a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java +++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaReceivers.java @@ -4,7 +4,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; -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/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java index def7dd4e0baff..e7d0ac0ca77a6 100644 --- a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java +++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PetProducer.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PetProducer.java index 53fae75a0afbc..c161c96d30920 100644 --- a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PetProducer.java +++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PetProducer.java @@ -1,6 +1,6 @@ package io.quarkus.it.kafka; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Outgoing; diff --git a/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/MQTTEndpoint.java b/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/MQTTEndpoint.java index 3d09b90c9dcca..76666267de8de 100644 --- a/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/MQTTEndpoint.java +++ b/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/MQTTEndpoint.java @@ -2,12 +2,12 @@ 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 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; @Path("/mqtt") public class MQTTEndpoint { diff --git a/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/PeopleManager.java b/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/PeopleManager.java index c624c76375bf6..36a6737faa664 100644 --- a/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/PeopleManager.java +++ b/integration-tests/reactive-messaging-mqtt/src/main/java/io/quarkus/it/mqtt/PeopleManager.java @@ -5,8 +5,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Stream; -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/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java index d01dd90bd33e7..6c54928112a30 100644 --- a/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java +++ b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.reactive.messaging.Incoming; diff --git a/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.java b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.java index c8c29898fdcf4..aa46b44a3c321 100644 --- a/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.java +++ b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.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/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.java b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.java index 217c715f09b78..28d0f9474123f 100644 --- a/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.java +++ b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.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; @Path("/rabbitmq") public class RabbitMQEndpoint { diff --git a/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/TestCredentialsProvider.java b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/TestCredentialsProvider.java index 6ee393de8b0c3..d7a9fd9f80eac 100644 --- a/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/TestCredentialsProvider.java +++ b/integration-tests/reactive-messaging-rabbitmq-dyn/src/main/java/io/quarkus/it/rabbitmq/TestCredentialsProvider.java @@ -3,8 +3,8 @@ import java.time.Instant; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java b/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java index b466a5198f8cc..5a35ccc071e34 100644 --- a/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java +++ b/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleManager.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.java b/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.java index c8c29898fdcf4..aa46b44a3c321 100644 --- a/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.java +++ b/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/PeopleProducer.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/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.java b/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.java index 217c715f09b78..28d0f9474123f 100644 --- a/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.java +++ b/integration-tests/reactive-messaging-rabbitmq/src/main/java/io/quarkus/it/rabbitmq/RabbitMQEndpoint.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; @Path("/rabbitmq") public class RabbitMQEndpoint { diff --git a/integration-tests/reactive-mssql-client/src/main/java/io/quarkus/it/reactive/mssql/client/FruitResource.java b/integration-tests/reactive-mssql-client/src/main/java/io/quarkus/it/reactive/mssql/client/FruitResource.java index 6284cf1d78656..c6430046e0611 100644 --- a/integration-tests/reactive-mssql-client/src/main/java/io/quarkus/it/reactive/mssql/client/FruitResource.java +++ b/integration-tests/reactive-mssql-client/src/main/java/io/quarkus/it/reactive/mssql/client/FruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/reactive-mssql-client/src/test/java/io/quarkus/it/reactive/mssql/client/HotReloadFruitResource.java b/integration-tests/reactive-mssql-client/src/test/java/io/quarkus/it/reactive/mssql/client/HotReloadFruitResource.java index f78a572737ae2..f6a50e4a5f6ca 100644 --- a/integration-tests/reactive-mssql-client/src/test/java/io/quarkus/it/reactive/mssql/client/HotReloadFruitResource.java +++ b/integration-tests/reactive-mssql-client/src/test/java/io/quarkus/it/reactive/mssql/client/HotReloadFruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java b/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java index 54d0adc901dbb..316e34d90854f 100644 --- a/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java +++ b/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/reactive-oracle-client/src/main/java/io/quarkus/it/reactive/oracle/client/FruitResource.java b/integration-tests/reactive-oracle-client/src/main/java/io/quarkus/it/reactive/oracle/client/FruitResource.java index cc7513dff96d7..0d329a6d9d4dd 100644 --- a/integration-tests/reactive-oracle-client/src/main/java/io/quarkus/it/reactive/oracle/client/FruitResource.java +++ b/integration-tests/reactive-oracle-client/src/main/java/io/quarkus/it/reactive/oracle/client/FruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/reactive-oracle-client/src/test/java/io/quarkus/it/reactive/oracle/client/HotReloadFruitResource.java b/integration-tests/reactive-oracle-client/src/test/java/io/quarkus/it/reactive/oracle/client/HotReloadFruitResource.java index 8a7d8d29e12ef..8301f108736d7 100644 --- a/integration-tests/reactive-oracle-client/src/test/java/io/quarkus/it/reactive/oracle/client/HotReloadFruitResource.java +++ b/integration-tests/reactive-oracle-client/src/test/java/io/quarkus/it/reactive/oracle/client/HotReloadFruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java b/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java index 62ffa12205ff4..0d22a897c80ad 100644 --- a/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java +++ b/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java index 07caee6d4921b..f8b03e847518b 100644 --- a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java +++ b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java @@ -2,10 +2,10 @@ import java.util.concurrent.CompletionStage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisLocalHostProvider.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisLocalHostProvider.java index 8d7d04b562e83..1d89abf3e8e4d 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisLocalHostProvider.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisLocalHostProvider.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.redis.client.RedisHostsProvider; import io.smallrye.common.annotation.Identifier; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java index a84ba98f88555..e5393ecc99fc3 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.quarkus.redis.datasource.ReactiveRedisDataSource; import io.quarkus.redis.datasource.RedisDataSource; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResourceWithNamedClient.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResourceWithNamedClient.java index 37a59e84aaa3c..cf6d2ce9030d1 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResourceWithNamedClient.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResourceWithNamedClient.java @@ -1,10 +1,10 @@ package io.quarkus.redis.it; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.quarkus.redis.client.RedisClientName; import io.quarkus.redis.datasource.ReactiveRedisDataSource; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithInstanceInjectionResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithInstanceInjectionResource.java index cb06f78f7c1bf..54e39ecc2e24f 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithInstanceInjectionResource.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithInstanceInjectionResource.java @@ -1,12 +1,12 @@ package io.quarkus.redis.it; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.quarkus.redis.client.RedisClientName; import io.quarkus.redis.datasource.ReactiveRedisDataSource; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java index 8f763ce375929..24474fd4b0d6b 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java @@ -2,12 +2,12 @@ import java.util.Arrays; -import javax.enterprise.context.ApplicationScoped; -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 jakarta.enterprise.context.ApplicationScoped; +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 io.quarkus.redis.client.RedisClient; import io.quarkus.redis.client.RedisClientName; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java index e1970b58cb871..bef72d097b12e 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java @@ -2,12 +2,12 @@ import java.util.Arrays; -import javax.enterprise.context.ApplicationScoped; -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 jakarta.enterprise.context.ApplicationScoped; +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 io.quarkus.redis.client.RedisClient; import io.quarkus.redis.client.RedisClientName; diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithProvidedHostsResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithProvidedHostsResource.java index 75e0c09b70187..b3467e3f45b5e 100644 --- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithProvidedHostsResource.java +++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithProvidedHostsResource.java @@ -1,11 +1,11 @@ package io.quarkus.redis.it; -import javax.enterprise.context.ApplicationScoped; -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 jakarta.enterprise.context.ApplicationScoped; +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 io.quarkus.redis.client.RedisClientName; import io.quarkus.redis.datasource.ReactiveRedisDataSource; diff --git a/integration-tests/redis-devservices/src/test/java/io/quarkus/redis/devservices/it/DevServicesRedisITest.java b/integration-tests/redis-devservices/src/test/java/io/quarkus/redis/devservices/it/DevServicesRedisITest.java index 2d88d683e9f79..3189dd1d733dc 100644 --- a/integration-tests/redis-devservices/src/test/java/io/quarkus/redis/devservices/it/DevServicesRedisITest.java +++ b/integration-tests/redis-devservices/src/test/java/io/quarkus/redis/devservices/it/DevServicesRedisITest.java @@ -2,7 +2,7 @@ import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml b/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml index 49e282a1fb813..d35feed394251 100644 --- a/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml +++ b/integration-tests/rest-client-reactive-kotlin-serialization/pom.xml @@ -119,7 +119,7 @@ kotlinx-serialization - + diff --git a/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesClient.kt b/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesClient.kt index 89602e9d73ba9..32f6884d6e09e 100644 --- a/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesClient.kt +++ b/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesClient.kt @@ -1,14 +1,14 @@ package io.quarkus.it.rest import io.quarkus.rest.client.reactive.ClientExceptionMapper +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 jakarta.ws.rs.core.Response import org.jboss.resteasy.reactive.ClientWebApplicationException -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 javax.ws.rs.core.Response @Path("") interface CountriesClient { diff --git a/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesResource.kt b/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesResource.kt index a87de1f5713a8..e168b4fc1e888 100644 --- a/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesResource.kt +++ b/integration-tests/rest-client-reactive-kotlin-serialization/src/main/kotlin/io/quarkus/it/rest/CountriesResource.kt @@ -3,14 +3,14 @@ package io.quarkus.it.rest import io.vertx.ext.web.Router import io.vertx.ext.web.RoutingContext import io.vertx.ext.web.handler.BodyHandler +import jakarta.enterprise.context.ApplicationScoped +import jakarta.enterprise.event.Observes +import jakarta.ws.rs.Path import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.eclipse.microprofile.rest.client.RestClientBuilder import java.net.URI -import javax.enterprise.context.ApplicationScoped -import javax.enterprise.event.Observes -import javax.ws.rs.Path @Path("/") @ApplicationScoped diff --git a/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartClient.java b/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartClient.java index 39205fa58f290..d29ab1e011046 100644 --- a/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartClient.java +++ b/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartClient.java @@ -2,12 +2,12 @@ import java.io.File; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -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.FormParam; +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/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartResource.java b/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartResource.java index f314d7b305576..94447060b1cf8 100644 --- a/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartResource.java +++ b/integration-tests/rest-client-reactive-multipart/src/main/java/io/quarkus/it/rest/client/multipart/MultipartResource.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -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.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +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.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.jboss.logging.Logger; diff --git a/integration-tests/rest-client-reactive-multipart/src/test/java/io/quarkus/it/rest/client/multipart/MultipartResourceTest.java b/integration-tests/rest-client-reactive-multipart/src/test/java/io/quarkus/it/rest/client/multipart/MultipartResourceTest.java index feec2c5c565c1..ae15ebc9a2ccb 100644 --- a/integration-tests/rest-client-reactive-multipart/src/test/java/io/quarkus/it/rest/client/multipart/MultipartResourceTest.java +++ b/integration-tests/rest-client-reactive-multipart/src/test/java/io/quarkus/it/rest/client/multipart/MultipartResourceTest.java @@ -6,7 +6,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.equalTo; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Test; diff --git a/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/Client.java b/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/Client.java index f6390e407021e..3c3bcea3042bc 100644 --- a/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/Client.java +++ b/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/Client.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest.client.reactive.stork; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/ClientCallingResource.java b/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/ClientCallingResource.java index 92be79b449f9d..2e3a307174dc8 100644 --- a/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/ClientCallingResource.java +++ b/integration-tests/rest-client-reactive-stork/src/main/java/io/quarkus/it/rest/client/reactive/stork/ClientCallingResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest.client.reactive.stork; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/AppleClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/AppleClient.java index 608df268226a2..3360905921c7b 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/AppleClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/AppleClient.java @@ -2,11 +2,11 @@ import java.util.concurrent.CompletionStage; -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.annotation.RegisterProvider; import org.jboss.resteasy.reactive.RestResponse; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientCallingResource.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientCallingResource.java index 9e94a122f1f6b..cbfb888a8fb27 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientCallingResource.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientCallingResource.java @@ -6,10 +6,10 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientWithExceptionMapper.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientWithExceptionMapper.java index b663cb54a2285..96d031cfcd583 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientWithExceptionMapper.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ClientWithExceptionMapper.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest.client.main; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/DefaultCtorTestFilter.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/DefaultCtorTestFilter.java index 9e28969533afd..1705020628eb9 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/DefaultCtorTestFilter.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/DefaultCtorTestFilter.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest.client.main; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; public class DefaultCtorTestFilter implements ClientRequestFilter { diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceClient.java index ceab46764717b..27a6a6a7f0d37 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceClient.java @@ -1,10 +1,10 @@ package io.quarkus.it.rest.client.main; -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.faulttolerance.Fallback; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceOnInterfaceClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceOnInterfaceClient.java index 83cdab622d461..3c0c4d3a181ce 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceOnInterfaceClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/FaultToleranceOnInterfaceClient.java @@ -2,11 +2,11 @@ import java.time.temporal.ChronoUnit; -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.faulttolerance.CircuitBreaker; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/HelloClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/HelloClient.java index 4d9ade9614667..09ecbd0ee8800 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/HelloClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/HelloClient.java @@ -1,13 +1,13 @@ package io.quarkus.it.rest.client.main; -import javax.ws.rs.Consumes; -import javax.ws.rs.NotFoundException; -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 javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.NotFoundException; +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 jakarta.ws.rs.core.Response; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/MyResponseExceptionMapper.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/MyResponseExceptionMapper.java index 0eac6781c46b5..620657cee48cb 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/MyResponseExceptionMapper.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/MyResponseExceptionMapper.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest.client.main; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/NonDefaultCtorTestFilter.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/NonDefaultCtorTestFilter.java index 1d613a901ef02..19f071a048a35 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/NonDefaultCtorTestFilter.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/NonDefaultCtorTestFilter.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest.client.main; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamClient.java index 8826ca59a7b67..47220bf6c9124 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamClient.java @@ -1,10 +1,10 @@ package io.quarkus.it.rest.client.main; -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.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.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamConverter.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamConverter.java index a0f2b6a0ff6ea..8b2fd60c86a68 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamConverter.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/ParamConverter.java @@ -3,13 +3,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.QueryParam; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.ext.ParamConverterProvider; public class ParamConverter implements ParamConverterProvider { @SuppressWarnings("unchecked") @Override - public javax.ws.rs.ext.ParamConverter getConverter(Class rawType, Type genericType, + public jakarta.ws.rs.ext.ParamConverter getConverter(Class rawType, Type genericType, Annotation[] annotations) { if (genericType == null || !genericType.equals(Param.class)) { throw new RuntimeException("Wrong generic type in ParamConverter!"); @@ -20,7 +20,7 @@ public javax.ws.rs.ext.ParamConverter getConverter(Class rawType, Type } if (rawType == Param.class) { - return (javax.ws.rs.ext.ParamConverter) new javax.ws.rs.ext.ParamConverter() { + return (jakarta.ws.rs.ext.ParamConverter) new jakarta.ws.rs.ext.ParamConverter() { @Override public Param fromString(String value) { return null; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/RestResponseClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/RestResponseClient.java index 49ed4092650c4..3264cb16b1762 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/RestResponseClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/RestResponseClient.java @@ -1,9 +1,9 @@ package io.quarkus.it.rest.client.main; -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/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/selfsigned/ExternalSelfSignedClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/selfsigned/ExternalSelfSignedClient.java index 7d2610f75b4be..8f68088b3064b 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/selfsigned/ExternalSelfSignedClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/selfsigned/ExternalSelfSignedClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest.client.main.selfsigned; -import javax.ws.rs.GET; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.faulttolerance.Retry; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanDataModuleSerializer.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanDataModuleSerializer.java index e3f232d083297..0acaa1dd26cd4 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanDataModuleSerializer.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanDataModuleSerializer.java @@ -1,6 +1,6 @@ package io.quarkus.it.rest.client.main.tracing; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanExporterProvider.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanExporterProvider.java index facf5ac25fb32..e0a4ccd0a3c65 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanExporterProvider.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/tracing/SpanExporterProvider.java @@ -1,8 +1,8 @@ package io.quarkus.it.rest.client.main.tracing; -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 io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter; diff --git a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/wronghost/WrongHostClient.java b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/wronghost/WrongHostClient.java index 5ad6b037d7b18..ca4777eb8713e 100644 --- a/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/wronghost/WrongHostClient.java +++ b/integration-tests/rest-client-reactive/src/main/java/io/quarkus/it/rest/client/main/wronghost/WrongHostClient.java @@ -1,9 +1,9 @@ package io.quarkus.it.rest.client.main.wronghost; -import javax.ws.rs.GET; -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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.faulttolerance.Retry; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java index 1dcefd8c28784..b4a80c3a95559 100644 --- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java +++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/ClientWithCustomObjectMapperTest.java @@ -9,12 +9,12 @@ import java.net.URL; import java.util.Objects; -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 javax.ws.rs.ext.ContextResolver; +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 jakarta.ws.rs.ext.ContextResolver; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.jboss.resteasy.reactive.ClientWebApplicationException; diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/InjectMockWithInterceptorTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/InjectMockWithInterceptorTest.java index e2f2ccf14b282..dad4e747d0d54 100644 --- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/InjectMockWithInterceptorTest.java +++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/InjectMockWithInterceptorTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.hamcrest.Matchers; diff --git a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/RequestEncodingTest.java b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/RequestEncodingTest.java index 7e0c2d30c8dd1..5bc86de9f43be 100644 --- a/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/RequestEncodingTest.java +++ b/integration-tests/rest-client-reactive/src/test/java/io/quarkus/it/rest/client/RequestEncodingTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientBuilder; import org.junit.jupiter.api.Test; diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartBody.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartBody.java index 5d8fad932bf25..0a9205b9cd237 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartBody.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/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/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartClientResource.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartClientResource.java index 5f8b29e73d323..cdda2dddf51e3 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartClientResource.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartClientResource.java @@ -3,12 +3,12 @@ import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; -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 org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartService.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartService.java index 26021b4751c24..ee51472257231 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartService.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/MultipartService.java @@ -1,10 +1,10 @@ package io.quarkus.it.rest.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.annotations.providers.multipart.MultipartForm; @@ -18,4 +18,4 @@ public interface MultipartService { @Produces(MediaType.TEXT_PLAIN) String sendMultipartData(@MultipartForm MultipartBody data); -} \ No newline at end of file +} diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java index 04d41d312c643..4dd6d3d5af6af 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java @@ -1,7 +1,7 @@ package io.quarkus.it.rest.client.selfsigned; -import javax.ws.rs.GET; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.faulttolerance.Retry; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java index 5f022460e746a..4bfd0c3b296b6 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java @@ -3,12 +3,13 @@ import java.io.IOException; import java.net.URL; -import javax.inject.Inject; import javax.net.ssl.HttpsURLConnection; -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/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/server/EchoService.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/server/EchoService.java index 3dd1885cad839..6f5817ffa902f 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/server/EchoService.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/server/EchoService.java @@ -1,10 +1,10 @@ package io.quarkus.it.rest.client.server; -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; @Path("/echo") public class EchoService { @@ -15,4 +15,4 @@ public class EchoService { public String echo(String requestBody) throws Exception { return requestBody; } -} \ No newline at end of file +} diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java index 1fbf3e8f12676..1cb45fd029dda 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java @@ -1,9 +1,9 @@ package io.quarkus.it.rest.client.wronghost; -import javax.ws.rs.GET; -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.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.faulttolerance.Retry; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java index e6cc0b2a51c2e..abe386335e58f 100644 --- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java +++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java @@ -2,11 +2,11 @@ import java.io.IOException; -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/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java index 0de72ea7cbb70..1624e1413ec32 100644 --- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java +++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.resteasy.jackson; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/abstract") public abstract class AbstractResource { diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java index e0219dc7fbcd9..4fbc9f6d616b0 100644 --- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java +++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java @@ -4,8 +4,8 @@ import java.math.BigInteger; import java.util.Map; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path("/bigkeys") public class BigKeysResource { diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java index 1c1b1a9cb0b47..86be0fc37d46d 100644 --- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java +++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java @@ -3,10 +3,10 @@ import java.sql.Date; import java.time.LocalDate; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; import org.jboss.resteasy.spi.ResteasyConfiguration; diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/MessageResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/MessageResource.java index 7d30f002765b7..8a3f91dab3a2e 100644 --- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/MessageResource.java +++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/MessageResource.java @@ -1,7 +1,7 @@ package io.quarkus.it.resteasy.jackson; -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/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java index 6b4862df1ece7..7273f77daec51 100644 --- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java +++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.resteasy.jackson.generics; -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("/generics") public class GenericsResource { diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java index 98b4c143a0b3c..ba4d9996cf52d 100644 --- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java +++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java @@ -2,12 +2,12 @@ import java.io.IOException; -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; import org.jboss.resteasy.reactive.RestStreamElementType; diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java index ae5f83c3cd25f..6e6e981a36ccf 100644 --- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java +++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java @@ -1,7 +1,7 @@ package io.quarkus.it.resteasy.mutiny; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/SomeService.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/SomeService.java index daa49f5aaee73..6b67831838885 100644 --- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/SomeService.java +++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/SomeService.java @@ -3,9 +3,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/BlockingService.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/BlockingService.java index 8d90464e7455b..9038b3a623bf6 100644 --- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/BlockingService.java +++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/BlockingService.java @@ -1,6 +1,6 @@ package io.quarkus.it.resteasy.mutiny.regression.bug25818; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.vertx.core.Context; import io.vertx.core.Vertx; diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/ReproducerResource.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/ReproducerResource.java index f1bda2b1aec4c..63f4f8331a03f 100644 --- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/ReproducerResource.java +++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/regression/bug25818/ReproducerResource.java @@ -2,11 +2,11 @@ import java.util.concurrent.TimeUnit; -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/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java b/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java index f5e37d6f984d0..7bffac78fde11 100644 --- a/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java +++ b/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java @@ -8,11 +8,11 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; -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.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml b/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml index 909c0e8f70db5..19345f4cd97e9 100644 --- a/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml +++ b/integration-tests/resteasy-reactive-kotlin/prod-mode/pom.xml @@ -150,8 +150,8 @@ all-open - - + + diff --git a/integration-tests/resteasy-reactive-kotlin/prod-mode/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/BlockingCoroutinesTest.java b/integration-tests/resteasy-reactive-kotlin/prod-mode/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/BlockingCoroutinesTest.java index 0e89f8efae0ff..d2b47b377e1db 100644 --- a/integration-tests/resteasy-reactive-kotlin/prod-mode/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/BlockingCoroutinesTest.java +++ b/integration-tests/resteasy-reactive-kotlin/prod-mode/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/BlockingCoroutinesTest.java @@ -4,7 +4,7 @@ import java.util.function.Supplier; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml index 7b0ae5874e3fb..bf8df26dd4354 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml +++ b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml @@ -238,8 +238,8 @@ all-open - - + + diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/AppSuppliedProvider.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/AppSuppliedProvider.kt index b752ab3362f18..7212351d0f29b 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/AppSuppliedProvider.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/AppSuppliedProvider.kt @@ -1,17 +1,17 @@ package io.quarkus.it.resteasy.reactive.kotlin import io.quarkus.it.shared.Shared +import jakarta.ws.rs.Consumes +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.MultivaluedMap +import jakarta.ws.rs.ext.MessageBodyReader +import jakarta.ws.rs.ext.MessageBodyWriter +import jakarta.ws.rs.ext.Provider import java.io.InputStream import java.io.OutputStream import java.lang.reflect.Type import java.nio.charset.StandardCharsets -import javax.ws.rs.Consumes -import javax.ws.rs.Produces -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.MultivaluedMap -import javax.ws.rs.ext.MessageBodyReader -import javax.ws.rs.ext.MessageBodyWriter -import javax.ws.rs.ext.Provider @Provider @Produces("text/plain") diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesEndpoint.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesEndpoint.kt index 4e434b3599a32..733358f6b9d58 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesEndpoint.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesEndpoint.kt @@ -1,13 +1,13 @@ package io.quarkus.it.resteasy.reactive.kotlin import io.quarkus.smallrye.reactivemessaging.sendSuspending +import jakarta.ws.rs.GET +import jakarta.ws.rs.POST +import jakarta.ws.rs.Path import kotlinx.coroutines.delay import org.eclipse.microprofile.reactive.messaging.Channel import org.eclipse.microprofile.reactive.messaging.Emitter import org.eclipse.microprofile.rest.client.inject.RestClient -import javax.ws.rs.GET -import javax.ws.rs.POST -import javax.ws.rs.Path @Path("country") class CountriesEndpoint( diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesGateway.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesGateway.kt index 6f2db020989cf..afb8fe1eef1b0 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesGateway.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountriesGateway.kt @@ -1,8 +1,8 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path import org.eclipse.microprofile.rest.client.inject.RegisterRestClient -import javax.ws.rs.GET -import javax.ws.rs.Path @Path("/v2") @RegisterRestClient(configKey = "countries") diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameConsumer.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameConsumer.kt index 91161261bb08d..64961aa63d2d7 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameConsumer.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameConsumer.kt @@ -1,9 +1,9 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.enterprise.context.ApplicationScoped import org.eclipse.microprofile.reactive.messaging.Incoming import org.eclipse.microprofile.rest.client.inject.RestClient import java.util.concurrent.ConcurrentHashMap -import javax.enterprise.context.ApplicationScoped @ApplicationScoped class CountryNameConsumer(@RestClient private val countryGateway: CountriesGateway) { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameMessageTransformer.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameMessageTransformer.kt index 350f51c12c2b3..c0acaf9b98300 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameMessageTransformer.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameMessageTransformer.kt @@ -1,10 +1,10 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.enterprise.context.ApplicationScoped import kotlinx.coroutines.delay import org.eclipse.microprofile.reactive.messaging.Incoming import org.eclipse.microprofile.reactive.messaging.Message import org.eclipse.microprofile.reactive.messaging.Outgoing -import javax.enterprise.context.ApplicationScoped @ApplicationScoped class CountryNameMessageTransformer { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt index 4de37aa47f689..217f3f7d3968e 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt @@ -1,9 +1,9 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.enterprise.context.ApplicationScoped import kotlinx.coroutines.delay import org.eclipse.microprofile.reactive.messaging.Incoming import org.eclipse.microprofile.reactive.messaging.Outgoing -import javax.enterprise.context.ApplicationScoped @ApplicationScoped class CountryNamePayloadTransformer { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameProducer.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameProducer.kt index 3981b29c2402d..97fd608d94bf6 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameProducer.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNameProducer.kt @@ -1,8 +1,8 @@ package io.quarkus.it.resteasy.reactive.kotlin import io.smallrye.mutiny.Multi +import jakarta.enterprise.context.ApplicationScoped import org.eclipse.microprofile.reactive.messaging.Outgoing -import javax.enterprise.context.ApplicationScoped @ApplicationScoped class CountryNameProducer { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/EnumEndpoint.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/EnumEndpoint.kt index 390cc56c8fae7..dc91bc16f0477 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/EnumEndpoint.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/EnumEndpoint.kt @@ -1,10 +1,10 @@ package io.quarkus.it.resteasy.reactive.kotlin -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 @Path("enum") class EnumEndpoint { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/Filters.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/Filters.kt index 1a20619ff2f15..f125ccf565fda 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/Filters.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/Filters.kt @@ -1,15 +1,15 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.ws.rs.container.ContainerRequestContext +import jakarta.ws.rs.container.ContainerResponseContext +import jakarta.ws.rs.container.ResourceInfo +import jakarta.ws.rs.core.Response +import jakarta.ws.rs.core.UriInfo import kotlinx.coroutines.delay import org.jboss.resteasy.reactive.server.ServerRequestFilter import org.jboss.resteasy.reactive.server.ServerResponseFilter import org.jboss.resteasy.reactive.server.SimpleResourceInfo import java.security.SecureRandom -import javax.ws.rs.container.ContainerRequestContext -import javax.ws.rs.container.ContainerResponseContext -import javax.ws.rs.container.ResourceInfo -import javax.ws.rs.core.Response -import javax.ws.rs.core.UriInfo class Filters { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResource.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResource.kt index fa0173208358d..264a6f527c99e 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResource.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResource.kt @@ -1,15 +1,15 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import org.jboss.resteasy.reactive.ResponseHeader import org.jboss.resteasy.reactive.ResponseStatus import org.jboss.resteasy.reactive.RestSseElementType -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.Produces -import javax.ws.rs.core.MediaType @Path("flow") class FlowResource(private val uppercaseService: UppercaseService) { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/GreetingResource.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/GreetingResource.kt index d7e6f350165ce..ec678c2f2d765 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/GreetingResource.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/GreetingResource.kt @@ -1,14 +1,14 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.ws.rs.GET +import jakarta.ws.rs.POST +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.core.Context +import jakarta.ws.rs.core.HttpHeaders +import jakarta.ws.rs.core.Response +import jakarta.ws.rs.core.UriInfo import org.jboss.resteasy.reactive.RestHeader -import javax.ws.rs.GET -import javax.ws.rs.POST -import javax.ws.rs.Path -import javax.ws.rs.PathParam -import javax.ws.rs.core.Context -import javax.ws.rs.core.HttpHeaders -import javax.ws.rs.core.Response -import javax.ws.rs.core.UriInfo @Path("/greeting") class GreetingResource(val headers: HttpHeaders) { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ReactiveGreetingResource.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ReactiveGreetingResource.kt index 56bc3d2e7129b..37aa578a98faa 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ReactiveGreetingResource.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ReactiveGreetingResource.kt @@ -1,11 +1,11 @@ package io.quarkus.it.resteasy.reactive.kotlin +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 kotlinx.coroutines.delay -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 @Path("/hello-resteasy-reactive") class ReactiveGreetingResource @Inject constructor(val req: RequestScopedKotlinClass) { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/RequestScopedKotlinClass.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/RequestScopedKotlinClass.kt index e2945172f0a62..35df5f1a00b24 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/RequestScopedKotlinClass.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/RequestScopedKotlinClass.kt @@ -1,6 +1,6 @@ package io.quarkus.it.resteasy.reactive.kotlin -import javax.enterprise.context.RequestScoped +import jakarta.enterprise.context.RequestScoped @RequestScoped class RequestScopedKotlinClass { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ScheduledEndpoint.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ScheduledEndpoint.kt index 2109028b7e9cd..87e6829534b22 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ScheduledEndpoint.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ScheduledEndpoint.kt @@ -2,11 +2,11 @@ package io.quarkus.it.resteasy.reactive.kotlin import io.quarkus.scheduler.Scheduled import io.quarkus.scheduler.ScheduledExecution +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.core.Response import kotlinx.coroutines.delay import java.util.concurrent.atomic.AtomicInteger -import javax.ws.rs.GET -import javax.ws.rs.Path -import javax.ws.rs.core.Response @Path("scheduled") class ScheduledEndpoint { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/SharedResource.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/SharedResource.kt index 56dc8563dd391..141d2f2e69d62 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/SharedResource.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/SharedResource.kt @@ -1,10 +1,10 @@ package io.quarkus.it.resteasy.reactive.kotlin import io.quarkus.it.shared.Shared -import javax.ws.rs.Consumes -import javax.ws.rs.POST -import javax.ws.rs.Path -import javax.ws.rs.Produces +import jakarta.ws.rs.Consumes +import jakarta.ws.rs.POST +import jakarta.ws.rs.Path +import jakarta.ws.rs.Produces @Path("/shared") class SharedResource { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/UppercaseService.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/UppercaseService.kt index 131167520db44..35ef43dbd08ac 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/UppercaseService.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/UppercaseService.kt @@ -1,7 +1,7 @@ package io.quarkus.it.resteasy.reactive.kotlin +import jakarta.enterprise.context.RequestScoped import java.util.Locale -import javax.enterprise.context.RequestScoped @RequestScoped class UppercaseService { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/V2CountryEndpoint.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/V2CountryEndpoint.kt index 8e579e4756041..5c67748d1e6c6 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/V2CountryEndpoint.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/V2CountryEndpoint.kt @@ -1,7 +1,7 @@ package io.quarkus.it.resteasy.reactive.kotlin -import javax.ws.rs.GET -import javax.ws.rs.Path +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path @Path("v2") class V2CountryEndpoint { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/ClientResource.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/ClientResource.kt index 46c616f45cfdd..9689d613da61e 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/ClientResource.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/ClientResource.kt @@ -1,9 +1,9 @@ package io.quarkus.it.resteasy.reactive.kotlin.ft +import jakarta.inject.Inject +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path import org.eclipse.microprofile.rest.client.inject.RestClient -import javax.inject.Inject -import javax.ws.rs.GET -import javax.ws.rs.Path @Path("/ft/client") class ClientResource { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloClient.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloClient.kt index b7232d6f1b8c4..a1ba25962fca3 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloClient.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloClient.kt @@ -1,9 +1,9 @@ package io.quarkus.it.resteasy.reactive.kotlin.ft +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path import org.eclipse.microprofile.faulttolerance.Fallback import org.eclipse.microprofile.rest.client.inject.RegisterRestClient -import javax.ws.rs.GET -import javax.ws.rs.Path @Path("/ft/hello") @RegisterRestClient(configKey = "ft-hello") diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloResource.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloResource.kt index ccc9a82c9dde7..1394f6734c105 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloResource.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/ft/HelloResource.kt @@ -1,10 +1,10 @@ package io.quarkus.it.resteasy.reactive.kotlin.ft +import jakarta.ws.rs.GET +import jakarta.ws.rs.InternalServerErrorException +import jakarta.ws.rs.POST +import jakarta.ws.rs.Path import java.util.concurrent.atomic.AtomicBoolean -import javax.ws.rs.GET -import javax.ws.rs.InternalServerErrorException -import javax.ws.rs.POST -import javax.ws.rs.Path @Path("/ft/hello") class HelloResource { diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResourceTest.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResourceTest.kt index 546f1b455507e..95f8531a86b69 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResourceTest.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/test/kotlin/io/quarkus/it/resteasy/reactive/kotlin/FlowResourceTest.kt @@ -4,14 +4,14 @@ import io.quarkus.test.common.http.TestHTTPResource import io.quarkus.test.junit.QuarkusTest import io.restassured.module.kotlin.extensions.Then import io.restassured.module.kotlin.extensions.When +import jakarta.ws.rs.client.ClientBuilder +import jakarta.ws.rs.client.WebTarget +import jakarta.ws.rs.sse.SseEventSource import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.Collections import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit -import javax.ws.rs.client.ClientBuilder -import javax.ws.rs.client.WebTarget -import javax.ws.rs.sse.SseEventSource @QuarkusTest class FlowResourceTest { diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/HelloResource.scala b/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/HelloResource.scala index 8a930050757fb..570d6d1d2a5d9 100644 --- a/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/HelloResource.scala +++ b/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/HelloResource.scala @@ -1,8 +1,8 @@ package org.acme -import javax.inject.Inject -import javax.ws.rs.{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.inject.Inject +import jakarta.ws.rs.{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType import org.eclipse.microprofile.config.inject.ConfigProperty import scala.beans.BeanProperty diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/MyApplication.scala b/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/MyApplication.scala index 25d15b93bfcb9..0cb1692fe4f23 100644 --- a/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/MyApplication.scala +++ b/integration-tests/scala/src/test/resources/projects/classic-scala/src/main/scala/org/acme/MyApplication.scala @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.ApplicationPath -import javax.ws.rs.core.Application +import jakarta.ws.rs.ApplicationPath +import jakarta.ws.rs.core.Application @ApplicationPath("/app") class MyApplication extends Application diff --git a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/src/main/scala/org/acme/GreetingResource.scala b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/src/main/scala/org/acme/GreetingResource.scala index d3d0aeae8392b..3f7f5c2c95ab2 100644 --- a/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/src/main/scala/org/acme/GreetingResource.scala +++ b/integration-tests/scala/src/test/resources/projects/external-reloadable-artifacts/app/src/main/scala/org/acme/GreetingResource.scala @@ -1,7 +1,7 @@ package org.acme -import javax.ws.rs.{GET, Path, Produces} -import javax.ws.rs.core.MediaType +import jakarta.ws.rs.{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType import org.acme.lib.Greeting diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/AdminResource.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/AdminResource.java index 19508e61ff486..af79507163c04 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/AdminResource.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/AdminResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.security.webauthn; -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("/api/admin") public class AdminResource { @@ -15,4 +15,4 @@ public class AdminResource { public String adminResource() { return "admin"; } -} \ No newline at end of file +} diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/LoginResource.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/LoginResource.java index 34390064973b7..e14bbfbc04f73 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/LoginResource.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/LoginResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.security.webauthn; -import javax.inject.Inject; -import javax.ws.rs.BeanParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.inject.Inject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.reactive.RestForm; @@ -105,4 +105,4 @@ public Uni register(@RestForm String userName, }); } -} \ No newline at end of file +} diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/MyWebAuthnSetup.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/MyWebAuthnSetup.java index f3a8d34f78586..26a5891c715d5 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/MyWebAuthnSetup.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/MyWebAuthnSetup.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.common.runtime.ReactiveTransactional; import io.quarkus.security.webauthn.WebAuthnUserProvider; diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/PublicResource.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/PublicResource.java index 87828f2902b35..da3da14b5237a 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/PublicResource.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/PublicResource.java @@ -2,12 +2,12 @@ import java.security.Principal; -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("/api/public") public class PublicResource { @@ -25,4 +25,4 @@ public String me(@Context SecurityContext securityContext) { Principal user = securityContext.getUserPrincipal(); return user != null ? user.getName() : ""; } -} \ No newline at end of file +} diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/User.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/User.java index b5449f167b5b3..dc4861726bca8 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/User.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/User.java @@ -1,9 +1,9 @@ package io.quarkus.it.security.webauthn; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import io.quarkus.hibernate.reactive.panache.PanacheEntity; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/UserResource.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/UserResource.java index 8b2f210e2678e..01b4315e087ad 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/UserResource.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/UserResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.security.webauthn; -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("/api/users") public class UserResource { diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCertificate.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCertificate.java index 4b3de74f1eb99..8b0d97ddebb4e 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCertificate.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCertificate.java @@ -1,7 +1,7 @@ package io.quarkus.it.security.webauthn; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import io.quarkus.hibernate.reactive.panache.PanacheEntity; diff --git a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCredential.java b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCredential.java index 9f6530973c844..b6d6fd0f9396b 100644 --- a/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCredential.java +++ b/integration-tests/security-webauthn/src/main/java/io/quarkus/it/security/webauthn/WebAuthnCredential.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import io.quarkus.hibernate.reactive.panache.PanacheEntity; import io.smallrye.mutiny.Uni; diff --git a/integration-tests/shared-library/pom.xml b/integration-tests/shared-library/pom.xml index c434a40145128..555c19ca29b32 100644 --- a/integration-tests/shared-library/pom.xml +++ b/integration-tests/shared-library/pom.xml @@ -21,8 +21,8 @@ jakarta.servlet-api - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/RemovedResource.java b/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/RemovedResource.java index 22de78c92c670..fcd3590fe8e7d 100644 --- a/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/RemovedResource.java +++ b/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/RemovedResource.java @@ -1,7 +1,7 @@ package io.quarkus.it.shared; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/removed") public class RemovedResource { diff --git a/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedProvider.java b/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedProvider.java index ebba660d78ca1..ec46218fca8d6 100644 --- a/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedProvider.java +++ b/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedProvider.java @@ -7,13 +7,13 @@ import java.lang.reflect.Type; import java.nio.charset.StandardCharsets; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; @Produces({ "application/json", "text/plain" }) @Consumes({ "application/json", "text/plain" }) diff --git a/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedResource.java b/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedResource.java index 0dcf3ce84f797..41abfd58758b6 100644 --- a/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedResource.java +++ b/integration-tests/shared-library/src/main/java/io/quarkus/it/shared/SharedResource.java @@ -3,8 +3,8 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/shared") public class SharedResource { diff --git a/integration-tests/shared-library/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/integration-tests/shared-library/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers similarity index 100% rename from integration-tests/shared-library/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers rename to integration-tests/shared-library/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers diff --git a/integration-tests/simple with space/src/main/java/io/quarkus/it/spaces/GreetingResource.java b/integration-tests/simple with space/src/main/java/io/quarkus/it/spaces/GreetingResource.java index ad59740540dd3..9381193f0d0c2 100644 --- a/integration-tests/simple with space/src/main/java/io/quarkus/it/spaces/GreetingResource.java +++ b/integration-tests/simple with space/src/main/java/io/quarkus/it/spaces/GreetingResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.spaces; -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.primefaces.util.Constants; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/AppConfigResouce.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/AppConfigResouce.java index 1a7773ca062a9..4be114bc1217e 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/AppConfigResouce.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/AppConfigResouce.java @@ -1,8 +1,8 @@ package io.quarkus.it.smallrye.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("/app-config") public class AppConfigResouce { diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java index 8cb380f7d6f49..965f05f25bc9c 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.smallrye.config; -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 javax.ws.rs.core.Response; +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 jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java index b38f6a77f6cae..a6bd4319a01c5 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java @@ -1,10 +1,10 @@ package io.quarkus.it.smallrye.config; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperResource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperResource.java index c70a0cd34ca81..3ff126df39b79 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperResource.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.smallrye.config; -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("/exception") @Produces(MediaType.WILDCARD) diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java index 05f517fc8b4d7..0db1b6f0d571d 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java @@ -1,6 +1,6 @@ package io.quarkus.it.smallrye.config; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import io.smallrye.config.ConfigSourceInterceptor; import io.smallrye.config.ConfigSourceInterceptorContext; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Prod.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Prod.java index 6010a1f6925b5..8926ce36b4107 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Prod.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Prod.java @@ -5,10 +5,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; @Target({ ElementType.TYPE_USE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java index c98ee3d649714..b5a51a4289c11 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java @@ -8,9 +8,9 @@ import java.util.Optional; import java.util.OptionalInt; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.config.spi.Converter; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerDynamicFeature.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerDynamicFeature.java index 453c1bec6a32b..03724cd5de659 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerDynamicFeature.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerDynamicFeature.java @@ -1,11 +1,11 @@ package io.quarkus.it.smallrye.config; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; -import javax.ws.rs.ext.Provider; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerFilter.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerFilter.java index 24e26522e302d..5765c89349924 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerFilter.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerFilter.java @@ -1,9 +1,9 @@ package io.quarkus.it.smallrye.config; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; @Priority(1001) public class ServerFilter implements ContainerResponseFilter { diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java index eb63076d17514..02104ce29d8e8 100644 --- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java +++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java @@ -3,14 +3,14 @@ import java.lang.reflect.Method; import java.util.List; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObjectBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperties; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigMockTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigMockTest.java index 82d08e97f288c..3bc0a370a6c42 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigMockTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigMockTest.java @@ -1,12 +1,12 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.is; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.Test; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigTest.java index ed01d19f7daba..4bf31bd20eff0 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/AppConfigTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.startsWith; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java index bf4e6cca949dc..72dd028a87f86 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.Test; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java index 74dcdff5ab01b..89e5574b5ef6d 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.Test; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperTest.java index 62682b8a21698..87d58b8f82cd2 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapperTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.Test; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java index b0bf16c790c53..6e2ec3ba38a93 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.Test; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/FallbackLocationsTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/FallbackLocationsTest.java index 442e7185bfef0..58bee11abc979 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/FallbackLocationsTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/FallbackLocationsTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import java.util.HashMap; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/HibernatePropertiesTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/HibernatePropertiesTest.java index 95fcd721824dd..6e5132c0aefe6 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/HibernatePropertiesTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/HibernatePropertiesTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.logging.Level; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java index ad4d81df86e09..8e60d04ff7bc4 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java index 20e591f143cbb..f2109c0907e18 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import java.util.HashMap; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java index 63bfed5338bfc..c84c5e42be445 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java @@ -1,10 +1,10 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.HttpHeaders.ACCEPT; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java index 999b7c5d84ba7..9c44ef11107bc 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.config; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/User.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/User.java index 67c9f056c6cff..43ac801344cef 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/User.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/User.java @@ -2,10 +2,10 @@ import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/UserResource.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/UserResource.java index ee90e82855810..498599f80915c 100644 --- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/UserResource.java +++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/UserResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.smallrye.config; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; -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.persistence.EntityManager; +import jakarta.transaction.Transactional; +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("/users") @Transactional diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CompletionExceptionMapper.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CompletionExceptionMapper.java index aaff122983a20..e9af3fa355577 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CompletionExceptionMapper.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CompletionExceptionMapper.java @@ -2,12 +2,12 @@ import java.util.concurrent.CompletionException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Providers; /** * Workaround of https://github.com/resteasy/Resteasy/pull/2001 diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEndpoint.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEndpoint.java index 28d6329961c48..645b6f1c906ff 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEndpoint.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEndpoint.java @@ -5,18 +5,18 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.inject.Inject; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.Transactional; -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.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.inject.Inject; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.Transactional; +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.Response; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEntity.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEntity.java index 823278650b5fb..f3e75c2d453d4 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEntity.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ContextEntity.java @@ -1,6 +1,6 @@ package io.quarkus.context.test; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java index 72734036b49a6..aaee4c5a4fa69 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/CustomProducersTest.java @@ -1,6 +1,6 @@ package io.quarkus.context.test; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ProducerBean.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ProducerBean.java index 6791140938600..a676064c54a3c 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ProducerBean.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/ProducerBean.java @@ -1,8 +1,8 @@ package io.quarkus.context.test; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/RequestBean.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/RequestBean.java index 44d9b29128207..9bedd34bcf228 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/RequestBean.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/RequestBean.java @@ -2,8 +2,8 @@ import java.util.concurrent.CountDownLatch; -import javax.annotation.PreDestroy; -import javax.enterprise.context.RequestScoped; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestBean { diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java index b6e9272bcac50..c54ebeb9236c8 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java @@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/TransactionalBean.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/TransactionalBean.java index bdf2488c2388a..b64da1fcf74d1 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/TransactionalBean.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/TransactionalBean.java @@ -1,10 +1,10 @@ package io.quarkus.context.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java index 56ae0760cc2cd..e96795a95e1d1 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/customContext/CustomContextTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ThreadContext; import org.eclipse.microprofile.context.spi.ThreadContextProvider; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextEndpoint.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextEndpoint.java index 3aad5ba422ea2..26b82ed2877cb 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextEndpoint.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextEndpoint.java @@ -4,26 +4,26 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.Transactional; -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.Response; -import javax.ws.rs.core.UriInfo; +import java.util.concurrent.Flow; + +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.Transactional; +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.Response; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.microprofile.context.ManagedExecutor; import org.eclipse.microprofile.context.ThreadContext; import org.junit.jupiter.api.Assertions; -import org.reactivestreams.Publisher; import org.wildfly.common.Assert; import io.quarkus.arc.Arc; @@ -455,7 +455,7 @@ public Multi transactionPropagationWithMulti() throws SystemException { @Transactional @GET @Path("/transaction-multi-2") - public Publisher transactionPropagationWithMulti2() { + public Flow.Publisher transactionPropagationWithMulti2() { Multi ret = Multi.createFrom().item("OK"); // now delete both entities Assertions.assertEquals(2, Person.deleteAll()); diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java index 9114bca6431a3..d8df31f05ed58 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyContextPropagationTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.awaitility.Awaitility; import org.awaitility.core.ThrowingRunnable; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyTransactionalBean.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyTransactionalBean.java index a2c5fe9ea4c67..e3b22ad7b2339 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyTransactionalBean.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/MutinyTransactionalBean.java @@ -1,10 +1,10 @@ package io.quarkus.context.test.mutiny; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; -import javax.transaction.Transactional.TxType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; +import jakarta.transaction.Transactional.TxType; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/Person.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/Person.java index 24d2dc896d50b..fcc12ab628c44 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/Person.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/Person.java @@ -1,6 +1,6 @@ package io.quarkus.context.test.mutiny; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeEntity.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeEntity.java index 13a59d79ec72b..a329c40c8537c 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeEntity.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeEntity.java @@ -1,6 +1,6 @@ package io.quarkus.context.test.mutiny; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeOtherEntity.java b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeOtherEntity.java index 51359da2f47c2..7403588894044 100644 --- a/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeOtherEntity.java +++ b/integration-tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/mutiny/SomeOtherEntity.java @@ -1,6 +1,6 @@ package io.quarkus.context.test.mutiny; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import io.quarkus.hibernate.orm.panache.PanacheEntity; diff --git a/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/GraphQLClientTester.java b/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/GraphQLClientTester.java index d0969e6423c63..b96e988fb2431 100644 --- a/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/GraphQLClientTester.java +++ b/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/GraphQLClientTester.java @@ -10,11 +10,11 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import io.smallrye.graphql.client.GraphQLClient; import io.smallrye.graphql.client.Response; diff --git a/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/LuckyNumbersResource.java b/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/LuckyNumbersResource.java index ef1603309804e..9d7f2575a3ff5 100644 --- a/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/LuckyNumbersResource.java +++ b/integration-tests/smallrye-graphql-client/src/main/java/io/quarkus/io/smallrye/graphql/client/LuckyNumbersResource.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.Mutation; diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/FaultTolerantService.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/FaultTolerantService.java index 424e11a083c69..dab2bd4c08e64 100644 --- a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/FaultTolerantService.java +++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/FaultTolerantService.java @@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.eclipse.microprofile.faulttolerance.Timeout; diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java index 2adf24d17bc23..17aa5f700c79c 100644 --- a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java +++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.graphql.DefaultValue; diff --git a/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/PayloadCreator.java b/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/PayloadCreator.java index 09391ce449575..858cb5d55984d 100644 --- a/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/PayloadCreator.java +++ b/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/PayloadCreator.java @@ -1,7 +1,7 @@ package io.quarkus.it.smallrye.graphql; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; public class PayloadCreator { diff --git a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml index d61917f1ecae1..2aa9cfa6aa79c 100644 --- a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml +++ b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml @@ -34,8 +34,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/integration-tests/smallrye-jwt-oidc-webapp/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/smallrye-jwt-oidc-webapp/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index 97d8c268ef160..d64746d914f9c 100644 --- a/integration-tests/smallrye-jwt-oidc-webapp/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/smallrye-jwt-oidc-webapp/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.keycloak; -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.Authenticated; import io.quarkus.security.identity.SecurityIdentity; diff --git a/integration-tests/smallrye-jwt-token-propagation/pom.xml b/integration-tests/smallrye-jwt-token-propagation/pom.xml index eead619e88381..947d08bb5abba 100644 --- a/integration-tests/smallrye-jwt-token-propagation/pom.xml +++ b/integration-tests/smallrye-jwt-token-propagation/pom.xml @@ -34,8 +34,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java index 86040a731f5b6..b44bf256ce5c1 100644 --- a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java +++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java @@ -1,8 +1,8 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java index 6801322b6e698..ca54f476f4ab9 100644 --- a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java +++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java index a897f7451ecd2..e246f0900a1d1 100644 --- a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java +++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java @@ -3,11 +3,11 @@ import java.security.PublicKey; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.Path; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java index c5c8b87eb9545..5bea495c654fe 100644 --- a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java +++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java @@ -1,7 +1,7 @@ package io.quarkus.it.keycloak; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java index cfb75423868eb..d9187dc7e9d1f 100644 --- a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java +++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedJwtResource.java @@ -2,14 +2,14 @@ import java.security.Principal; -import javax.annotation.security.RolesAllowed; -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.core.Context; -import javax.ws.rs.core.SecurityContext; +import jakarta.annotation.security.RolesAllowed; +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.core.Context; +import jakarta.ws.rs.core.SecurityContext; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java index a26f6dd8b10fb..c67ebb7fecd04 100644 --- a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java +++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.keycloak; -import javax.annotation.security.RolesAllowed; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGauge.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGauge.java index 1e2fd2da4b625..0f788f40e9d32 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGauge.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGauge.java @@ -1,8 +1,8 @@ package io.quarkus.it.metrics; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.interceptor.AroundConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.interceptor.AroundConstruct; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.Gauge; diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java index e07e303bd8438..29c78c41a14d1 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java @@ -1,7 +1,7 @@ package io.quarkus.it.metrics; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.Gauge; diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java index a8d39499e3714..a65c50d95d69b 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java @@ -1,6 +1,6 @@ package io.quarkus.it.metrics; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsResource.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsResource.java index 866e95c4135df..761aac9aa721a 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsResource.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsResource.java @@ -3,10 +3,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.metrics.Histogram; import org.eclipse.microprofile.metrics.MetricUnits; diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java index 96753b2022eab..a58874e3b8a5f 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java @@ -1,6 +1,6 @@ package io.quarkus.it.metrics.inheritance; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java index 2c6b6468dde54..76032f6ebf7e6 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java @@ -1,6 +1,6 @@ package io.quarkus.it.metrics.inheritance; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class InheritanceMetricsExtended extends InheritanceMetricsBase { diff --git a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java index 8a957f47175b4..b92eb3b0b82cc 100644 --- a/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java +++ b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java @@ -3,10 +3,10 @@ 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 jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/ExporterResource.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/ExporterResource.java index 8c211aa9b3b38..62373546b1dcf 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/ExporterResource.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/ExporterResource.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.stream.Collectors; -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.opentracing.mock.MockSpan; import io.opentracing.mock.MockTracer; diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/JdbcResource.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/JdbcResource.java index fff39dd376ada..0dd46624da87a 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/JdbcResource.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/JdbcResource.java @@ -5,10 +5,11 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; import javax.sql.DataSource; -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("/jdbc") public class JdbcResource { diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/MockTracerProvider.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/MockTracerProvider.java index 1a45fff41f029..248b94d9bc24f 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/MockTracerProvider.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/MockTracerProvider.java @@ -1,8 +1,8 @@ package io.quarkus.it.opentracing; -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 io.opentracing.mock.MockTracer; import io.opentracing.util.GlobalTracer; diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/PingPongResource.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/PingPongResource.java index 9ea16b4ca27b8..10baa8c973e4c 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/PingPongResource.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/PingPongResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.opentracing; -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RestClient; diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/SimpleResource.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/SimpleResource.java index 1af7a8c968563..0060eb38197ff 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/SimpleResource.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/SimpleResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.opentracing; -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("/") @Produces(MediaType.APPLICATION_JSON) diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracedService.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracedService.java index e9834a06c3391..ec2b2dbd17c7b 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracedService.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracedService.java @@ -1,6 +1,6 @@ package io.quarkus.it.opentracing; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class TracedService { diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracingProperyJdbcResource.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracingProperyJdbcResource.java index 36d66b2a814cd..b6fa2ada998f7 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracingProperyJdbcResource.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/TracingProperyJdbcResource.java @@ -5,10 +5,11 @@ import java.sql.SQLException; import java.sql.Statement; -import javax.inject.Inject; import javax.sql.DataSource; -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("/tracingpropertyjdbc") public class TracingProperyJdbcResource { diff --git a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/json/MockSpanModuleSerializer.java b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/json/MockSpanModuleSerializer.java index f8d30fe5088c1..d48e38d6149e4 100644 --- a/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/json/MockSpanModuleSerializer.java +++ b/integration-tests/smallrye-opentracing/src/main/java/io/quarkus/it/opentracing/json/MockSpanModuleSerializer.java @@ -1,6 +1,6 @@ package io.quarkus.it.opentracing.json; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/BeanPropertiesResource.java b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/BeanPropertiesResource.java index 37e24df67ff6c..fa9ad3e5fee80 100644 --- a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/BeanPropertiesResource.java +++ b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/BeanPropertiesResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.boot; -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("/bean") public class BeanPropertiesResource { diff --git a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/ClassPropertiesResource.java b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/ClassPropertiesResource.java index 2cf1a0b143609..409d8ca39c7db 100644 --- a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/ClassPropertiesResource.java +++ b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/ClassPropertiesResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.boot; -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("/class") public class ClassPropertiesResource { diff --git a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/DefaultPropertiesResource.java b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/DefaultPropertiesResource.java index 8e53fab28e530..ca32766a887da 100644 --- a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/DefaultPropertiesResource.java +++ b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/DefaultPropertiesResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.boot; -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("/default") public class DefaultPropertiesResource { diff --git a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/InterfacePropertiesResource.java b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/InterfacePropertiesResource.java index 5f577c55a75cc..556219dc1e246 100644 --- a/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/InterfacePropertiesResource.java +++ b/integration-tests/spring-boot-properties/src/main/java/io/quarkus/it/spring/boot/InterfacePropertiesResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.boot; -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("/interface") public class InterfacePropertiesResource { diff --git a/integration-tests/spring-cloud-config-client/src/main/java/io/quarkus/it/spring/config/server/client/ConfigResource.java b/integration-tests/spring-cloud-config-client/src/main/java/io/quarkus/it/spring/config/server/client/ConfigResource.java index f5ec994839597..2c2c2a00556a4 100644 --- a/integration-tests/spring-cloud-config-client/src/main/java/io/quarkus/it/spring/config/server/client/ConfigResource.java +++ b/integration-tests/spring-cloud-config-client/src/main/java/io/quarkus/it/spring/config/server/client/ConfigResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.spring.config.server.client; -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 javax.ws.rs.core.Response; +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 jakarta.ws.rs.core.Response; import io.quarkus.runtime.annotations.RegisterForReflection; import io.smallrye.config.SmallRyeConfig; diff --git a/integration-tests/spring-cloud-config-client/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientTest.java b/integration-tests/spring-cloud-config-client/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientTest.java index f8eed37182f2c..717200e00f432 100644 --- a/integration-tests/spring-cloud-config-client/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientTest.java +++ b/integration-tests/spring-cloud-config-client/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientTest.java @@ -1,7 +1,7 @@ package io.quarkus.spring.cloud.config.client.runtime; import static io.restassured.RestAssured.given; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.equalTo; import org.junit.jupiter.api.Test; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractEntity.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractEntity.java index a7d1b0a9c2788..0841483041fcb 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractEntity.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractEntity.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractEntity { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractPhoneEntity.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractPhoneEntity.java index e67bd3dd0a0cf..5898eae0984b0 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractPhoneEntity.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractPhoneEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; // demonstrates that @MappedSuperclass detection works for more than one level and for parameterized types @MappedSuperclass diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractTypedIdEntity.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractTypedIdEntity.java index d105ceea4978a..8d84fe5f3cd8f 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractTypedIdEntity.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/AbstractTypedIdEntity.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.MappedSuperclass; // example "base entity" using strongly typed ids (instead of just long) @MappedSuperclass diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java index 12303b9369144..68510e65f5dad 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class Animal { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Book.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Book.java index 230414f6b1754..868f3f8ff7fad 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Book.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Book.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Book extends NamedEntity { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/BookResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/BookResource.java index fabe2f6e6bb77..55e6342d340e3 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/BookResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/BookResource.java @@ -4,11 +4,11 @@ import java.util.Objects; import java.util.Optional; -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.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.Response; @Path("/book") public class BookResource { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java index 9183756c2805f..e586c6e7b6951 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity(name = "MotorCar") public class Car extends AbstractEntity { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.java index c9dd8758a6301..8e0a70a80f40e 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.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; @Path("/car") public class CarResource { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cart.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cart.java index ba9acf6587b12..783ecf10a9da1 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cart.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cart.java @@ -1,11 +1,11 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; @Entity public class Cart extends AbstractEntity { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CartResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CartResource.java index 2dcc9279feadb..8fc5400260b61 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CartResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CartResource.java @@ -4,12 +4,12 @@ import java.util.List; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.DELETE; +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; @Path("/cart") @Produces("application/json") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java index a39de395032f3..aa85625f86e5f 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Cat extends Mammal { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java index be990b701499c..c06d3e5d716d1 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java @@ -6,10 +6,10 @@ import java.util.Set; import java.util.stream.Collectors; -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; @Path("/cat") public class CatResource { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValue.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValue.java index dd80005feeafe..3f15ae3f1aeba 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValue.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValue.java @@ -1,10 +1,10 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValueResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValueResource.java index 62ce3a13ccabd..794b06b31639f 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValueResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatalogValueResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring.data.jpa; -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; @Path("/catalog-value") public class CatalogValueResource { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Country.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Country.java index 68ef0609abc28..425e8ff9fc3fe 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Country.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Country.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; @Entity public class Country extends NamedEntity { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java index 23ab25f8491b9..9d815040af3cb 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java @@ -4,12 +4,12 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.persistence.NoResultException; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.persistence.NoResultException; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Customer.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Customer.java index 2eecba3d1aab5..a410aaf4dc7a0 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Customer.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Customer.java @@ -2,11 +2,11 @@ import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.validation.constraints.Email; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.validation.constraints.Email; import org.springframework.data.domain.Persistable; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CustomerResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CustomerResource.java index 8583d5a181304..109ba40766447 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CustomerResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CustomerResource.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.DELETE; +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; @Path("/customer") @Produces("application/json") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java index 030e71f356e23..aa5c8808e92fd 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java @@ -1,11 +1,11 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "employee") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java index d8aea681c5430..23ed0e063727d 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java @@ -2,11 +2,11 @@ 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 javax.ws.rs.QueryParam; +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; @Path("/employee") @Produces("application/json") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FederalStateCatalogValue.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FederalStateCatalogValue.java index 9eb2f69272d8c..df0361b28f6c7 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FederalStateCatalogValue.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FederalStateCatalogValue.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("federalState") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FruitResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FruitResource.java index f24c9a6c8a435..9a8cb67239193 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FruitResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/FruitResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring.data.jpa; -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("/fruit") public class FruitResource { @@ -13,4 +13,4 @@ public class FruitResource { public String hello() { return "hello"; } -} \ No newline at end of file +} diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java index ccf6942096acb..cb9c585daf681 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class Mammal extends Animal { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Movie.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Movie.java index 6c88892dbab5a..30f75b3806518 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Movie.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Movie.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Movie extends MovieSuperclass { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java index 62fb24ab71b82..857f36dd13623 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java @@ -7,10 +7,10 @@ import java.util.Optional; import java.util.stream.Collectors; -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 org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieSuperclass.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieSuperclass.java index c3807bfb32f16..927f4fba2f296 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieSuperclass.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieSuperclass.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public abstract class MovieSuperclass { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/NamedEntity.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/NamedEntity.java index 4d9f11b20305c..283bd0545f6cd 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/NamedEntity.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/NamedEntity.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class NamedEntity { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Order.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Order.java index 98cef0208f58a..17a5dc0613ab6 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Order.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Order.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "orders") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/OrderResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/OrderResource.java index d65796f6b1ab9..3f668622c6f56 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/OrderResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/OrderResource.java @@ -2,11 +2,11 @@ import java.util.List; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; @Path("/order") @Produces("application/json") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java index cf9a9d0f4187f..8c6adc5977201 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java @@ -4,18 +4,18 @@ import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java index 9495f48338418..2e36f220e0287 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepositoryImpl.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; public class PersonRepositoryImpl implements PersonFragment, PersonFragment2 { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java index f656543562c06..a829eb7882218 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java @@ -12,12 +12,12 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.inject.Inject; -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 jakarta.inject.Inject; +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 org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCall.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCall.java index a3c5deef117b5..76eedbd9b23ac 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCall.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCall.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "phone_call") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallId.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallId.java index 5322c29edb989..438df17d37983 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallId.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallId.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class PhoneCallId extends PhoneNumberId { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallResource.java index 0a27f60c2e8c2..af88c3eb4a26a 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneCallResource.java @@ -2,11 +2,11 @@ import java.util.Set; -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 jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import io.quarkus.it.spring.data.jpa.PhoneCall.CallAgent; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneNumberId.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneNumberId.java index c87dcae5aeed4..fa8f6e69e609d 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneNumberId.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PhoneNumberId.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; // this is a bit artificial, but next to PhoneCallId there could be e.g. a PhoneBookEntryId subclass @MappedSuperclass diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java index 492fb814d2c4d..4e921073643e4 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java @@ -6,15 +6,15 @@ import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity(name = "Post") @Table(name = "post") diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostComment.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostComment.java index 04b2cb8a48752..3f23921c2ed9a 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostComment.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostComment.java @@ -1,11 +1,11 @@ package io.quarkus.it.spring.data.jpa; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java index 006fd83f36e1f..fa116cbdea6f2 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java @@ -6,11 +6,11 @@ import java.util.Map; import java.util.Optional; -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 jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; @Path("/post") public class PostResource { diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java index 50a85634a3618..e5ae76a6c1932 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java @@ -2,11 +2,11 @@ import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.SequenceGenerator; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java index 5c420f08ea87d..5c2b9bb4de1e2 100644 --- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java +++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java @@ -3,11 +3,11 @@ import java.util.List; import java.util.Optional; -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 jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java index 92074821e8b0f..5ef6e3a149cbb 100644 --- a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java +++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java @@ -1,8 +1,8 @@ package io.quarkus.it.spring.data.rest; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Author { diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java index d75a6b96032b1..17fc947f1aaef 100644 --- a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java +++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java @@ -1,7 +1,7 @@ package io.quarkus.it.spring.data.rest; -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.RestResource; diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java index eb2e6d1b572ed..92dad4cebbfc0 100644 --- a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java +++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java @@ -1,10 +1,10 @@ package io.quarkus.it.spring.data.rest; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotBlank; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotBlank; @Entity public class Book { diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java index bd9f76a1f7a89..2b037d0c0a929 100644 --- a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java +++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java @@ -8,8 +8,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.junit.jupiter.api.Test; diff --git a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java index 8931467b62f57..f8e5d31f010c4 100644 --- a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java +++ b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java index 0ca5c38cfce1c..5b79fca79c01c 100644 --- a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java +++ b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.spring; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -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.Context; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +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.Context; +import jakarta.ws.rs.core.MediaType; import io.quarkus.it.spring.AppConfiguration.CustomPrototypeBean; import io.quarkus.it.spring.AppConfiguration.NamedBean; diff --git a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/MyApplication.java b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/MyApplication.java index 77707e09985a7..fc57d456d945b 100644 --- a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/MyApplication.java +++ b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/MyApplication.java @@ -1,9 +1,9 @@ package io.quarkus.it.spring; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/spring-test") public class MyApplication extends Application { -} \ No newline at end of file +} diff --git a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/RequestBean.java b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/RequestBean.java index 08669ff1be239..be94b096a0c78 100644 --- a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/RequestBean.java +++ b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/RequestBean.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; @RequestService public class RequestBean { diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/CountResource.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/CountResource.java index 1ab31775d9830..6def1edb69db1 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/CountResource.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/CountResource.java @@ -1,10 +1,10 @@ package io.quarkus.it.spring.scheduled; -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("/spring/scheduler/count") public class CountResource { diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/Counter.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/Counter.java index 067a6fd3dc88a..ddd020243de14 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/Counter.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/scheduled/Counter.java @@ -2,8 +2,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import org.springframework.scheduling.annotation.Scheduled; diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Book.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Book.java index a893ed259da9b..121bd3543d82e 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Book.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Book.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.web; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Book { diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/CustomAdvice.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/CustomAdvice.java index ce892699c5ee8..c0c224c258ad6 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/CustomAdvice.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/CustomAdvice.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.web; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Error.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Error.java index a45058691defb..11d1a760470c8 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Error.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Error.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.web; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Error { diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/GreetingController.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/GreetingController.java index 8b76467d71eda..3477bbee3e75f 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/GreetingController.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/GreetingController.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.web; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Person.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Person.java index fc8bae5bf7185..ea5c542abd081 100644 --- a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Person.java +++ b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/Person.java @@ -1,6 +1,6 @@ package io.quarkus.it.spring.web; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class Person { diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java index 0ea7e33f3645d..7ddf2f0df8eaf 100644 --- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java +++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.Matchers.is; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.junit.jupiter.api.Test; diff --git a/integration-tests/test-extension/extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java b/integration-tests/test-extension/extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java index e0c6766c64cef..da88aa70ab171 100644 --- a/integration-tests/test-extension/extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java +++ b/integration-tests/test-extension/extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java @@ -23,9 +23,9 @@ import java.util.Set; import java.util.function.BooleanSupplier; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.jboss.logging.Logger; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/BuildTimeRunTimeConfigTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/BuildTimeRunTimeConfigTest.java index 09e307bff0d0c..9d50e539c409d 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/BuildTimeRunTimeConfigTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/BuildTimeRunTimeConfigTest.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -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.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/ConfigBuilderTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/ConfigBuilderTest.java index 182f44224e1c8..5254275f7dec6 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/ConfigBuilderTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/ConfigBuilderTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RecordedBuildProfileInRuntimeTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RecordedBuildProfileInRuntimeTest.java index 3d938f1b963b9..dd3c6ceb605ef 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RecordedBuildProfileInRuntimeTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RecordedBuildProfileInRuntimeTest.java @@ -5,7 +5,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RenameConfigTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RenameConfigTest.java index 2f4193a3d698b..5d1659845d00b 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RenameConfigTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RenameConfigTest.java @@ -7,7 +7,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/SecretKeysConfigTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/SecretKeysConfigTest.java index c13f7c2c2fdb1..120c4c6da57ec 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/SecretKeysConfigTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/SecretKeysConfigTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java index cb3bc0e8766af..40e94082a7627 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java @@ -1,6 +1,6 @@ package io.quarkus.config; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java index 267a922199d0f..74e26f61d38da 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; 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.extension.RegisterExtension; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/UnremoveableConfigMappingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/UnremoveableConfigMappingTest.java index 600a1aa45f98c..e0d56d94f537f 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/UnremoveableConfigMappingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/UnremoveableConfigMappingTest.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.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/AdditionalLocationsTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/AdditionalLocationsTest.java index e66a4cf5f2ecf..25cc8bc6d36df 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/AdditionalLocationsTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/AdditionalLocationsTest.java @@ -5,9 +5,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -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.Config; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfigMappingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfigMappingTest.java index d67d0f2be9fc5..0203c51396b5b 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfigMappingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfigMappingTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBean.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBean.java index e1668d6749360..6d739ea2a9eb1 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBean.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBean.java @@ -1,7 +1,7 @@ package io.quarkus.extest; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import io.quarkus.extest.runtime.config.AnotherPrefixConfig; import io.quarkus.extest.runtime.config.FooRuntimeConfig; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java index a2d7d872f5cc7..962237d464860 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java index ffcd7331fc683..db522995ff2b9 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java @@ -6,7 +6,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; import org.junit.jupiter.api.Test; diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java index e1c8d9e78af0a..97b201903d50f 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.Test; diff --git a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/RuntimeXmlConfigService.java b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/RuntimeXmlConfigService.java index 006b3030c7a5c..332062408c82a 100644 --- a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/RuntimeXmlConfigService.java +++ b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/RuntimeXmlConfigService.java @@ -33,7 +33,7 @@ public RuntimeXmlConfigService(XmlConfig config) { public void startService() throws IOException { log.infof("startService, config: %s", config); try { - log.infof("Class.forName(XmlRootElement): %s", Class.forName("javax.xml.bind.annotation.XmlRootElement")); + log.infof("Class.forName(XmlRootElement): %s", Class.forName("jakarta.xml.bind.annotation.XmlRootElement")); } catch (Exception e) { log.info("Failed to load XmlRootElement", e); } diff --git a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/CommandServlet.java b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/CommandServlet.java index 7e396d224182e..cbaf47ebf7a1e 100644 --- a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/CommandServlet.java +++ b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/CommandServlet.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.security.interfaces.DSAPublicKey; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Simple command dispatch servlet used for testing the state of the native image diff --git a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/PublicKeyProducer.java b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/PublicKeyProducer.java index 37a5f231aa419..a1ddc94afcf01 100644 --- a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/PublicKeyProducer.java +++ b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/beans/PublicKeyProducer.java @@ -2,8 +2,8 @@ import java.security.interfaces.DSAPublicKey; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.jboss.logging.Logger; diff --git a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlConfig.java b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlConfig.java index d79a892621080..aaf691f847f45 100644 --- a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlConfig.java +++ b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlConfig.java @@ -2,8 +2,8 @@ import java.util.ArrayList; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * A hypothetical configuration that needs xml parsing at build time diff --git a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlData.java b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlData.java index b5b432b98c139..dedb5da85202f 100644 --- a/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlData.java +++ b/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/config/XmlData.java @@ -2,7 +2,7 @@ import java.util.Date; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "data") public class XmlData { diff --git a/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/ClasspathTestEndpoint.java b/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/ClasspathTestEndpoint.java index 595c2d95bcdc2..9ec16d3d07cf5 100644 --- a/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/ClasspathTestEndpoint.java +++ b/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/ClasspathTestEndpoint.java @@ -7,11 +7,11 @@ import java.util.List; import java.util.Locale; -import javax.inject.Inject; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.extest.runtime.classpath.RecordedClasspathEntries; import io.quarkus.extest.runtime.classpath.RecordedClasspathEntries.Phase; diff --git a/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/FinalFieldReflectionTestEndpoint.java b/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/FinalFieldReflectionTestEndpoint.java index ad64cf932fd6b..d5422691d7f56 100644 --- a/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/FinalFieldReflectionTestEndpoint.java +++ b/integration-tests/test-extension/tests/src/main/java/io/quarkus/it/extension/FinalFieldReflectionTestEndpoint.java @@ -7,10 +7,10 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.quarkus.extest.runtime.FinalFieldReflectionObject; diff --git a/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResource.java b/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResource.java index 0c41915ced2fa..bd4c7d77ab7d4 100644 --- a/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResource.java +++ b/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResource.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Stereotype; import io.quarkus.test.common.QuarkusTestResource; diff --git a/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResourceWithList.java b/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResourceWithList.java index 09b6f5e41059a..ec818cef8840a 100644 --- a/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResourceWithList.java +++ b/integration-tests/test-extension/tests/src/test/java/io/quarkus/it/extension/CustomResourceWithList.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Stereotype; import io.quarkus.test.common.QuarkusTestResource; diff --git a/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java b/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java index 55f6c632eddfa..c6ad21e33b550 100644 --- a/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java +++ b/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java @@ -16,8 +16,8 @@ */ package io.quarkus.vertx.graphql.it; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import graphql.GraphQL; import graphql.schema.GraphQLSchema; diff --git a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/BeanRegisteringRoute.java b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/BeanRegisteringRoute.java index ab4e9744c589a..4c29494ec2761 100644 --- a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/BeanRegisteringRoute.java +++ b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/BeanRegisteringRoute.java @@ -1,7 +1,7 @@ package io.quarkus.it.vertx; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/FilterResource.java b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/FilterResource.java index efb5d1c1c0018..46236ae4b4674 100644 --- a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/FilterResource.java +++ b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/FilterResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -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 FilterResource { diff --git a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/HeaderResource.java b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/HeaderResource.java index df732a7549672..c0a56eccbeb54 100644 --- a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/HeaderResource.java +++ b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/HeaderResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -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 HeaderResource { diff --git a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/NettyEventLoopResource.java b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/NettyEventLoopResource.java index e4f9bd29d2bab..bf451d838b5fc 100644 --- a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/NettyEventLoopResource.java +++ b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/NettyEventLoopResource.java @@ -1,8 +1,8 @@ package io.quarkus.it.vertx; -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.netty.channel.EventLoopGroup; import io.quarkus.netty.BossEventLoopGroup; diff --git a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/SimpleResource.java b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/SimpleResource.java index 80af4d68570a8..48b63309978f3 100644 --- a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/SimpleResource.java +++ b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/SimpleResource.java @@ -1,9 +1,9 @@ package io.quarkus.it.vertx; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * diff --git a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java index 8484ecd555329..91bb34441944a 100644 --- a/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java +++ b/integration-tests/vertx-http/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java @@ -1,12 +1,12 @@ package io.quarkus.it.vertx; -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.vertx.core.Vertx; import io.vertx.ext.web.Router; diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java index d8078a64739d2..d140349416e12 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java @@ -4,8 +4,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.apache.commons.lang3.exception.ExceptionUtils; import org.junit.jupiter.api.Assertions; diff --git a/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/DisableNullValueSerializationCustomizer.java b/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/DisableNullValueSerializationCustomizer.java index 3418e56ca8178..f8b8a6fa42509 100644 --- a/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/DisableNullValueSerializationCustomizer.java +++ b/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/DisableNullValueSerializationCustomizer.java @@ -1,6 +1,6 @@ package com.example.reactivejackson; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/SimpleEndpoint.java b/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/SimpleEndpoint.java index aeca22c8bf4c6..b4b8e4199c133 100644 --- a/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/SimpleEndpoint.java +++ b/integration-tests/vertx-web-jackson/src/main/java/com/example/reactivejackson/SimpleEndpoint.java @@ -2,7 +2,7 @@ import static io.quarkus.vertx.web.Route.HttpMethod.GET; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RouteBase; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusConsumer.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusConsumer.java index 1cfb1af79207f..5500f18c869df 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusConsumer.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusConsumer.java @@ -1,6 +1,6 @@ package io.quarkus.it.vertx; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.ConsumeEvent; import io.vertx.core.MultiMap; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java index 46b21d3df937d..1b76c7c519c31 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java @@ -1,9 +1,9 @@ package io.quarkus.it.vertx; -import javax.inject.Inject; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.inject.Inject; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import io.smallrye.mutiny.Uni; import io.vertx.core.eventbus.DeliveryOptions; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/JsonTestResource.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/JsonTestResource.java index af372cfb9ffef..f9e76bcaa0d7d 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/JsonTestResource.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/JsonTestResource.java @@ -1,13 +1,13 @@ package io.quarkus.it.vertx; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; -import javax.ws.rs.*; +import jakarta.ws.rs.*; import io.vertx.core.json.Json; import io.vertx.core.json.JsonArray; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/MyApplication.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/MyApplication.java index ef746ad49de2a..e59c5370b4b94 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/MyApplication.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/MyApplication.java @@ -1,9 +1,9 @@ package io.quarkus.it.vertx; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/vertx-test") public class MyApplication extends Application { -} \ No newline at end of file +} diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java index 26d8358a446ae..6eae54a02ee5e 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java @@ -4,11 +4,11 @@ import java.util.Map; import java.util.UUID; -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.smallrye.mutiny.Uni; import io.vertx.mutiny.core.Vertx; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/faulttolerance/NonblockingFaultTolerantService.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/faulttolerance/NonblockingFaultTolerantService.java index ccff59d0a55dc..1994b59547f5a 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/faulttolerance/NonblockingFaultTolerantService.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/faulttolerance/NonblockingFaultTolerantService.java @@ -4,7 +4,7 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.faulttolerance.Fallback; import org.eclipse.microprofile.faulttolerance.Retry; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java index 35f2df0e1c05c..fd06c4fdc49d0 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java @@ -2,9 +2,9 @@ import java.util.concurrent.CountDownLatch; -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 io.quarkus.runtime.StartupEvent; import io.vertx.core.DeploymentOptions; diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java index 58a6c9641452d..530f11a8cf168 100644 --- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java +++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java @@ -1,11 +1,11 @@ package io.quarkus.it.vertx.verticles; -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.smallrye.mutiny.Uni; import io.vertx.mutiny.core.Vertx; diff --git a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/faulttolerance/VertxRetryFallbackTest.java b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/faulttolerance/VertxRetryFallbackTest.java index d0e64339bb176..8c4f8ad660304 100644 --- a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/faulttolerance/VertxRetryFallbackTest.java +++ b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/faulttolerance/VertxRetryFallbackTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/integration-tests/virtual-http-resteasy/src/main/java/io/quarkus/it/virtual/GreetingResource.java b/integration-tests/virtual-http-resteasy/src/main/java/io/quarkus/it/virtual/GreetingResource.java index f3757e6004f87..9c2ec2d388511 100644 --- a/integration-tests/virtual-http-resteasy/src/main/java/io/quarkus/it/virtual/GreetingResource.java +++ b/integration-tests/virtual-http-resteasy/src/main/java/io/quarkus/it/virtual/GreetingResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.virtual; -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; @Path("/hello") public class GreetingResource { diff --git a/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java b/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java index 9a8670932ab53..1a48ead8b5ec1 100644 --- a/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java +++ b/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java @@ -7,7 +7,7 @@ import java.nio.charset.StandardCharsets; import java.util.logging.Logger; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/FunqyGreeting.java b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/FunqyGreeting.java index 2ae05573f7576..453c4f4ca3374 100644 --- a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/FunqyGreeting.java +++ b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/FunqyGreeting.java @@ -1,6 +1,6 @@ package io.quarkus.it.virtual; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.funqy.Funq; diff --git a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingResource.java b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingResource.java index f3757e6004f87..9c2ec2d388511 100644 --- a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingResource.java +++ b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingResource.java @@ -1,11 +1,11 @@ package io.quarkus.it.virtual; -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; @Path("/hello") public class GreetingResource { diff --git a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingServlet.java b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingServlet.java index 73814b05ccdd0..66010d2d50bc7 100644 --- a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingServlet.java +++ b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingServlet.java @@ -2,11 +2,11 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello") public class GreetingServlet extends HttpServlet { diff --git a/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java b/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java index e67e654e7357a..0782c35e7ec3f 100644 --- a/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java +++ b/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java @@ -7,7 +7,7 @@ import java.nio.charset.StandardCharsets; import java.util.logging.Logger; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/integration-tests/websockets/src/main/java/io/quarkus/websockets/ChatServer.java b/integration-tests/websockets/src/main/java/io/quarkus/websockets/ChatServer.java index 85f942748f91d..ff47c8c492c69 100644 --- a/integration-tests/websockets/src/main/java/io/quarkus/websockets/ChatServer.java +++ b/integration-tests/websockets/src/main/java/io/quarkus/websockets/ChatServer.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; @ServerEndpoint("/chat/{username}") @ApplicationScoped diff --git a/integration-tests/websockets/src/test/java/io/quarkus/websockets/ChatTest.java b/integration-tests/websockets/src/test/java/io/quarkus/websockets/ChatTest.java index 9f81fdc9a52d2..7397573403223 100644 --- a/integration-tests/websockets/src/test/java/io/quarkus/websockets/ChatTest.java +++ b/integration-tests/websockets/src/test/java/io/quarkus/websockets/ChatTest.java @@ -4,11 +4,11 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -52,4 +52,4 @@ void message(String msg) { } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index a9d1c5c15d237..41a63a53fa543 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 2.11.0 - 6.14.2 + 7.4.0 diff --git a/tcks/microprofile-config/pom.xml b/tcks/microprofile-config/pom.xml index e5be6fdaa9f31..4cff3b44d6181 100644 --- a/tcks/microprofile-config/pom.xml +++ b/tcks/microprofile-config/pom.xml @@ -13,7 +13,7 @@ Quarkus - TCK - MicroProfile Config - 2.0.1 + 3.0.1 diff --git a/tcks/microprofile-context-propagation/pom.xml b/tcks/microprofile-context-propagation/pom.xml index 4767eb4c8708f..ba66ff5c001a0 100644 --- a/tcks/microprofile-context-propagation/pom.xml +++ b/tcks/microprofile-context-propagation/pom.xml @@ -14,7 +14,7 @@ Quarkus - TCK - MicroProfile Context Propagation - 1.2 + 1.3 diff --git a/tcks/microprofile-fault-tolerance/pom.xml b/tcks/microprofile-fault-tolerance/pom.xml index 0035bad6ad1f6..e85a7dd4e1707 100644 --- a/tcks/microprofile-fault-tolerance/pom.xml +++ b/tcks/microprofile-fault-tolerance/pom.xml @@ -13,7 +13,7 @@ Quarkus - TCK - MicroProfile Fault Tolerance - 3.0 + 4.0 diff --git a/tcks/microprofile-graphql/pom.xml b/tcks/microprofile-graphql/pom.xml index b1731e43372f1..7e7a6520b4291 100644 --- a/tcks/microprofile-graphql/pom.xml +++ b/tcks/microprofile-graphql/pom.xml @@ -14,7 +14,7 @@ Quarkus - TCK - MicroProfile GraphQL - 1.1.0 + 2.0 diff --git a/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java b/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java index 3b2c4fa1bd9f7..88e5833b705d1 100644 --- a/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java +++ b/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java @@ -20,9 +20,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.eclipse.microprofile.graphql.tck.dynamic.ExecutionDynamicTest; import org.eclipse.microprofile.graphql.tck.dynamic.SchemaDynamicValidityTest; diff --git a/tcks/microprofile-health/pom.xml b/tcks/microprofile-health/pom.xml index 4724151badf5b..0e74561113514 100644 --- a/tcks/microprofile-health/pom.xml +++ b/tcks/microprofile-health/pom.xml @@ -13,7 +13,7 @@ Quarkus - TCK - MicroProfile Health - 3.1 + 4.0 diff --git a/tcks/microprofile-jwt/pom.xml b/tcks/microprofile-jwt/pom.xml index 6a603eb0ce49f..0c77c7768923f 100644 --- a/tcks/microprofile-jwt/pom.xml +++ b/tcks/microprofile-jwt/pom.xml @@ -13,7 +13,7 @@ Quarkus - TCK - MicroProfile JWT - 1.2.2 + 2.0 diff --git a/tcks/microprofile-lra/pom.xml b/tcks/microprofile-lra/pom.xml index ff89ed367c6fd..0a68df979fa9c 100644 --- a/tcks/microprofile-lra/pom.xml +++ b/tcks/microprofile-lra/pom.xml @@ -13,7 +13,7 @@ Quarkus - TCK - MicroProfile LRA - 1.0 + 2.0-RC1 diff --git a/tcks/microprofile-lra/src/main/java/io/quarkus/tck/lra/NarayanaLRARecovery.java b/tcks/microprofile-lra/src/main/java/io/quarkus/tck/lra/NarayanaLRARecovery.java index 7c3cd165d8c33..536cfb11589d3 100644 --- a/tcks/microprofile-lra/src/main/java/io/quarkus/tck/lra/NarayanaLRARecovery.java +++ b/tcks/microprofile-lra/src/main/java/io/quarkus/tck/lra/NarayanaLRARecovery.java @@ -26,11 +26,11 @@ import java.net.URI; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.microprofile.lra.tck.service.spi.LRARecoveryService; import org.jboss.logging.Logger; diff --git a/tcks/microprofile-metrics/optional/pom.xml b/tcks/microprofile-metrics/optional/pom.xml index 4330e89439177..24b5627b4e5fe 100644 --- a/tcks/microprofile-metrics/optional/pom.xml +++ b/tcks/microprofile-metrics/optional/pom.xml @@ -64,8 +64,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api io.quarkus diff --git a/tcks/microprofile-metrics/pom.xml b/tcks/microprofile-metrics/pom.xml index 3143d9a964670..d4f43ccf44fe7 100644 --- a/tcks/microprofile-metrics/pom.xml +++ b/tcks/microprofile-metrics/pom.xml @@ -14,7 +14,7 @@ pom - 3.0.1 + 4.0.1 diff --git a/tcks/microprofile-metrics/rest/pom.xml b/tcks/microprofile-metrics/rest/pom.xml index 443f49df4ae93..2a300f5294483 100644 --- a/tcks/microprofile-metrics/rest/pom.xml +++ b/tcks/microprofile-metrics/rest/pom.xml @@ -62,8 +62,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/tcks/microprofile-openapi/pom.xml b/tcks/microprofile-openapi/pom.xml index 834843029ee21..6603cdeb1addd 100644 --- a/tcks/microprofile-openapi/pom.xml +++ b/tcks/microprofile-openapi/pom.xml @@ -14,7 +14,7 @@ Quarkus - TCK - MicroProfile OpenAPI - 2.0.1 + 3.0 @@ -78,12 +78,12 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api jakarta.servlet diff --git a/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ExceptionMapper.java b/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ExceptionMapper.java index 1c4deb50345ed..aecc605891e1d 100644 --- a/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ExceptionMapper.java +++ b/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ExceptionMapper.java @@ -1,8 +1,8 @@ package io.quarkus.tck.opentracing; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.Provider; /** * Temporary fix to catch exceptions thrown in JAX-RS endpoints @@ -11,7 +11,7 @@ * @author Pavol Loffay */ @Provider -public class ExceptionMapper implements javax.ws.rs.ext.ExceptionMapper { +public class ExceptionMapper implements jakarta.ws.rs.ext.ExceptionMapper { @Override public Response toResponse(RuntimeException exception) { diff --git a/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/MockTracerProducer.java b/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/MockTracerProducer.java index 3dd12ef522aca..37b2718d1acf9 100644 --- a/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/MockTracerProducer.java +++ b/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/MockTracerProducer.java @@ -1,12 +1,12 @@ package io.quarkus.tck.opentracing; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; import io.opentracing.Tracer; import io.opentracing.mock.MockTracer; diff --git a/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ResteasyClientTracingRegistrarProvider.java b/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ResteasyClientTracingRegistrarProvider.java index 64b5c881a28ee..6ea23bcf766a5 100644 --- a/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ResteasyClientTracingRegistrarProvider.java +++ b/tcks/microprofile-opentracing/base/src/main/java/io/quarkus/tck/opentracing/ResteasyClientTracingRegistrarProvider.java @@ -4,8 +4,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.inject.spi.CDI; -import javax.ws.rs.client.ClientBuilder; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.ws.rs.client.ClientBuilder; import org.eclipse.microprofile.opentracing.ClientTracingRegistrarProvider; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/tcks/microprofile-opentracing/pom.xml b/tcks/microprofile-opentracing/pom.xml index 500e04e84704d..9dc3eae41b770 100644 --- a/tcks/microprofile-opentracing/pom.xml +++ b/tcks/microprofile-opentracing/pom.xml @@ -14,7 +14,7 @@ Quarkus - TCK - MicroProfile OpenTracing Parent - 2.0 + 3.0 diff --git a/tcks/microprofile-reactive-messaging/pom.xml b/tcks/microprofile-reactive-messaging/pom.xml index 810d7a597cf13..3f114a2c1c5ec 100644 --- a/tcks/microprofile-reactive-messaging/pom.xml +++ b/tcks/microprofile-reactive-messaging/pom.xml @@ -14,7 +14,7 @@ Quarkus - TCK - MicroProfile Reactive Messaging - 2.0.1 + 3.0 diff --git a/tcks/microprofile-rest-client-reactive/pom.xml b/tcks/microprofile-rest-client-reactive/pom.xml index ff4b49466ab32..055d8e4916cc4 100644 --- a/tcks/microprofile-rest-client-reactive/pom.xml +++ b/tcks/microprofile-rest-client-reactive/pom.xml @@ -15,7 +15,7 @@ 8766 - 2.0 + 3.0 true false - javax.enterprise.context.Dependent + jakarta.enterprise.context.Dependent true true true diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java index 4460e7b62a9ea..05089bda68688 100644 --- a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java +++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java @@ -4,7 +4,7 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.eclipse.microprofile.rest.client.tck.providers.ReturnWithURLRequestFilter; diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java index 236ff6c8cde3a..17ebb8fec0725 100644 --- a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java +++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.tck.restclient.cdi; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java index f7554a4a3d945..cebcc6496184d 100644 --- a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java +++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({ METHOD, TYPE }) diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java index 2437dfdebd51f..795a9f9b52ddb 100644 --- a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java +++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java @@ -2,10 +2,10 @@ import java.lang.reflect.Method; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Loggable @Interceptor diff --git a/tcks/microprofile-rest-client/pom.xml b/tcks/microprofile-rest-client/pom.xml index f3d227a190adb..ef817cdcbb60f 100644 --- a/tcks/microprofile-rest-client/pom.xml +++ b/tcks/microprofile-rest-client/pom.xml @@ -14,7 +14,7 @@ Quarkus - TCK - MicroProfile REST Client - 2.0 + 3.0 + org.eclipse.microprofile.rest.client.tck.timeout.TimeoutBuilderIndependentOfMPConfigTest + org.eclipse.microprofile.rest.client.tck.timeout.TimeoutTest + org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigTest + org.eclipse.microprofile.rest.client.tck.timeout.TimeoutViaMPConfigWithConfigKeyTest org.eclipse.microprofile.rest.client.tck.cditests.HasConversationScopeTest diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java index 4460e7b62a9ea..05089bda68688 100644 --- a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java +++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java @@ -4,7 +4,7 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.eclipse.microprofile.rest.client.tck.providers.ReturnWithURLRequestFilter; diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java index 236ff6c8cde3a..17ebb8fec0725 100644 --- a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java +++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java @@ -1,7 +1,7 @@ package io.quarkus.tck.restclient.cdi; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java index f7554a4a3d945..cebcc6496184d 100644 --- a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java +++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({ METHOD, TYPE }) diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java index 2437dfdebd51f..795a9f9b52ddb 100644 --- a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java +++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java @@ -2,10 +2,10 @@ import java.lang.reflect.Method; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; @Loggable @Interceptor diff --git a/tcks/resteasy-reactive/pom.xml b/tcks/resteasy-reactive/pom.xml index e834a1cda6d58..53c51f2e962a0 100644 --- a/tcks/resteasy-reactive/pom.xml +++ b/tcks/resteasy-reactive/pom.xml @@ -17,7 +17,7 @@ - 67e8e59456a5c2cdf3370f7ed38f7f6b576177b9 + 34795c1d2159c420298916d640df239f249f4935 ${skipTests} ${exec.skip} diff --git a/test-framework/arquillian/src/main/java/io/quarkus/arquillian/InjectionEnricher.java b/test-framework/arquillian/src/main/java/io/quarkus/arquillian/InjectionEnricher.java index cf64dd40a206d..79c816d4c59f6 100644 --- a/test-framework/arquillian/src/main/java/io/quarkus/arquillian/InjectionEnricher.java +++ b/test-framework/arquillian/src/main/java/io/quarkus/arquillian/InjectionEnricher.java @@ -11,8 +11,8 @@ import java.util.function.BiFunction; import java.util.function.Supplier; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.BeanManager; import org.jboss.arquillian.container.spi.context.annotation.DeploymentScoped; import org.jboss.arquillian.core.api.InstanceProducer; diff --git a/test-framework/arquillian/src/main/java/io/quarkus/arquillian/MethodParameterInjectionPoint.java b/test-framework/arquillian/src/main/java/io/quarkus/arquillian/MethodParameterInjectionPoint.java index 82ac304c32d46..b55c4d9f1fefc 100644 --- a/test-framework/arquillian/src/main/java/io/quarkus/arquillian/MethodParameterInjectionPoint.java +++ b/test-framework/arquillian/src/main/java/io/quarkus/arquillian/MethodParameterInjectionPoint.java @@ -8,13 +8,13 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedCallable; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Qualifier; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedCallable; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Qualifier; public class MethodParameterInjectionPoint implements InjectionPoint { private Method method; diff --git a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/Foo.java b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/Foo.java index 08504edd18cfe..791f9db977665 100644 --- a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/Foo.java +++ b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/Foo.java @@ -1,8 +1,8 @@ package io.quarkus.arquillian.test; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent public class Foo { -} \ No newline at end of file +} diff --git a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/MethodParameterInjectionTest.java b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/MethodParameterInjectionTest.java index ed2ddd25771ca..594a4c54f3be5 100644 --- a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/MethodParameterInjectionTest.java +++ b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/MethodParameterInjectionTest.java @@ -11,11 +11,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Qualifier; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Qualifier; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit5.ArquillianExtension; diff --git a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleClass.java b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleClass.java index 92a180d719bf0..532bd2f101f2e 100644 --- a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleClass.java +++ b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleClass.java @@ -1,7 +1,7 @@ package io.quarkus.arquillian.test; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; @@ -14,4 +14,4 @@ public class SimpleClass { @Inject Foo foo; -} \ No newline at end of file +} diff --git a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleTest.java b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleTest.java index 3c2933e5bd560..6a3c190799d64 100644 --- a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleTest.java +++ b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleTest.java @@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleWarTest.java b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleWarTest.java index f23bf69fc6275..6d89fe0a12ebd 100644 --- a/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleWarTest.java +++ b/test-framework/arquillian/src/test/java/io/quarkus/arquillian/test/SimpleWarTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit5.ArquillianExtension; diff --git a/test-framework/common/src/main/java/io/quarkus/test/Mock.java b/test-framework/common/src/main/java/io/quarkus/test/Mock.java index 9476308555b01..48e27538e1bd9 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/Mock.java +++ b/test-framework/common/src/main/java/io/quarkus/test/Mock.java @@ -8,10 +8,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Stereotype; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; /** * The built-in stereotype intended for use with mock beans injected in tests. diff --git a/test-framework/common/src/main/java/io/quarkus/test/TestReactiveTransaction.java b/test-framework/common/src/main/java/io/quarkus/test/TestReactiveTransaction.java index 2ef6345b48f91..c9f6ae6c0f1e1 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/TestReactiveTransaction.java +++ b/test-framework/common/src/main/java/io/quarkus/test/TestReactiveTransaction.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; /** * Indicates that this method should be run in a rollback only reactive transaction. diff --git a/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java b/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java index 2a729cd560a01..f3819436ef888 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java +++ b/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; /** * Indicates that this method should be run in a rollback only JTA transaction. diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java index 4fa1e92a3a19d..59215a6250827 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java @@ -15,7 +15,7 @@ public static Object instantiateTest(Class testClass, ClassLoader classLoader try { Class actualTestClass = Class.forName(testClass.getName(), true, Thread.currentThread().getContextClassLoader()); - Class cdi = Thread.currentThread().getContextClassLoader().loadClass("javax.enterprise.inject.spi.CDI"); + Class cdi = Thread.currentThread().getContextClassLoader().loadClass("jakarta.enterprise.inject.spi.CDI"); Object instance = cdi.getMethod("current").invoke(null); Method selectMethod = cdi.getMethod("select", Class.class, Annotation[].class); Object cdiInstance = selectMethod.invoke(instance, actualTestClass, new Annotation[0]); diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java index 2284f19120cf7..f2714e742faf8 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.jboss.logmanager.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java index 2bf06b2c55ce8..d54dae369115f 100644 --- a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java +++ b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java @@ -9,9 +9,9 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Qualifier; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Qualifier; import org.mockito.Mockito; diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java index 5c73ff7f00568..af079e89bb715 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java @@ -16,7 +16,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Alternative; import org.jboss.jandex.Index; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java index f3aa07dc40270..be8c2323e5069 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java @@ -29,8 +29,8 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; import org.apache.commons.lang3.RandomStringUtils; import org.eclipse.microprofile.config.Config; diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMock.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMock.java index 06fa8a6951574..c1878377cbb70 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMock.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMock.java @@ -2,16 +2,16 @@ import java.lang.annotation.Annotation; -import javax.enterprise.inject.spi.CDI; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.util.TypeLiteral; import org.junit.jupiter.api.TestInstance; /** * Utility class that can be used to mock CDI normal scoped beans. * - * This includes beans that are {@link javax.enterprise.context.ApplicationScoped} and - * {@link javax.enterprise.context.RequestScoped}. + * This includes beans that are {@link jakarta.enterprise.context.ApplicationScoped} and + * {@link jakarta.enterprise.context.RequestScoped}. * * To use this inject the bean into a test, and then invoke the mock * method with your mock. diff --git a/test-framework/keycloak-server/pom.xml b/test-framework/keycloak-server/pom.xml index 237e1ca9c2203..406071e7fa18b 100644 --- a/test-framework/keycloak-server/pom.xml +++ b/test-framework/keycloak-server/pom.xml @@ -20,6 +20,12 @@ org.keycloak keycloak-core + + + com.sun.activation + jakarta.activation + + org.testcontainers @@ -35,6 +41,10 @@ + + org.eclipse.angus + angus-activation + io.quarkus quarkus-test-common diff --git a/test-framework/kubernetes-client/pom.xml b/test-framework/kubernetes-client/pom.xml index ad83c16dba30f..f05ef9e662662 100644 --- a/test-framework/kubernetes-client/pom.xml +++ b/test-framework/kubernetes-client/pom.xml @@ -62,8 +62,8 @@ jakarta.annotation-api - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/test-framework/oidc-server/src/main/java/io/quarkus/test/oidc/server/OidcWiremockTestResource.java b/test-framework/oidc-server/src/main/java/io/quarkus/test/oidc/server/OidcWiremockTestResource.java index 88bc2ec98a50a..5a2bd28f60ace 100644 --- a/test-framework/oidc-server/src/main/java/io/quarkus/test/oidc/server/OidcWiremockTestResource.java +++ b/test-framework/oidc-server/src/main/java/io/quarkus/test/oidc/server/OidcWiremockTestResource.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.Set; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.jboss.logging.Logger; import org.jose4j.keys.X509Util; diff --git a/test-framework/openshift-client/pom.xml b/test-framework/openshift-client/pom.xml index 734f9725baeb3..a17483675c3e6 100644 --- a/test-framework/openshift-client/pom.xml +++ b/test-framework/openshift-client/pom.xml @@ -52,8 +52,8 @@ jakarta.annotation-api - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/test-framework/security-jwt/src/main/java/io/quarkus/test/security/jwt/JwtTestSecurityIdentityAugmentorProducer.java b/test-framework/security-jwt/src/main/java/io/quarkus/test/security/jwt/JwtTestSecurityIdentityAugmentorProducer.java index 2685c86ca5b56..8b4c84f120304 100644 --- a/test-framework/security-jwt/src/main/java/io/quarkus/test/security/jwt/JwtTestSecurityIdentityAugmentorProducer.java +++ b/test-framework/security-jwt/src/main/java/io/quarkus/test/security/jwt/JwtTestSecurityIdentityAugmentorProducer.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.eclipse.microprofile.jwt.Claims; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/test-framework/security-oidc/src/main/java/io/quarkus/test/security/oidc/OidcTestSecurityIdentityAugmentorProducer.java b/test-framework/security-oidc/src/main/java/io/quarkus/test/security/oidc/OidcTestSecurityIdentityAugmentorProducer.java index 41be295b3d560..accf1ce2042f3 100644 --- a/test-framework/security-oidc/src/main/java/io/quarkus/test/security/oidc/OidcTestSecurityIdentityAugmentorProducer.java +++ b/test-framework/security-oidc/src/main/java/io/quarkus/test/security/oidc/OidcTestSecurityIdentityAugmentorProducer.java @@ -7,12 +7,12 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObjectBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObjectBuilder; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.jwt.Claims; diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java b/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java index a2f773fb6de88..d119fc4a4b2c6 100644 --- a/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java +++ b/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java @@ -7,8 +7,8 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.runtime.QuarkusPrincipal; diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/TestAuthController.java b/test-framework/security/src/main/java/io/quarkus/test/security/TestAuthController.java index f9960aec31103..e58f41b38b47a 100644 --- a/test-framework/security/src/main/java/io/quarkus/test/security/TestAuthController.java +++ b/test-framework/security/src/main/java/io/quarkus/test/security/TestAuthController.java @@ -1,10 +1,10 @@ package io.quarkus.test.security; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.interceptor.Interceptor; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.interceptor.Interceptor; import io.quarkus.runtime.LaunchMode; import io.quarkus.security.spi.runtime.AuthorizationController; diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/TestHttpAuthenticationMechanism.java b/test-framework/security/src/main/java/io/quarkus/test/security/TestHttpAuthenticationMechanism.java index 2e77b2c4b7882..a716c933e9b67 100644 --- a/test-framework/security/src/main/java/io/quarkus/test/security/TestHttpAuthenticationMechanism.java +++ b/test-framework/security/src/main/java/io/quarkus/test/security/TestHttpAuthenticationMechanism.java @@ -3,9 +3,9 @@ import java.util.Collections; import java.util.Set; -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.runtime.LaunchMode; import io.quarkus.security.identity.IdentityProviderManager; diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java b/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java index 338fdc0cde875..85dfe76543e3b 100644 --- a/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java +++ b/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java @@ -1,12 +1,12 @@ package io.quarkus.test.security; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import io.quarkus.runtime.LaunchMode; import io.quarkus.security.identity.SecurityIdentity; diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/TestPrincipalProducer.java b/test-framework/security/src/main/java/io/quarkus/test/security/TestPrincipalProducer.java index 5de64e970c770..fd11e5ca10487 100644 --- a/test-framework/security/src/main/java/io/quarkus/test/security/TestPrincipalProducer.java +++ b/test-framework/security/src/main/java/io/quarkus/test/security/TestPrincipalProducer.java @@ -2,13 +2,13 @@ import java.security.Principal; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.interceptor.Interceptor; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import io.quarkus.security.identity.SecurityIdentity;