jakartification: adjustments after merge Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml index 144b51d..8baea9c 100644 --- a/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml +++ b/bundles/jaxrs-ri/src/main/assembly/common-dependencies.xml
@@ -30,10 +30,10 @@ <exclude>jakarta.ws.rs:*</exclude> <exclude>org.glassfish.jersey.*:*</exclude> <!-- CDI API dependencies come from yasson, cdi is optional there --> - <exclude>javax.enterprise:cdi-api:jar:*</exclude> + <exclude>jakarta.enterprise:cdi-api:jar:*</exclude> <exclude>jakarta.el:el-api:jar:*</exclude> <exclude>org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar:*</exclude> - <exclude>javax.annotation:jsr250-api:jar:*</exclude> + <exclude>jakarta.annotation:jsr250-api:jar:*</exclude> </excludes> </dependencySet> <!-- JAX-RS RI provided dependencies -->
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/spi/PostInvocationInterceptor.java b/core-client/src/main/java/org/glassfish/jersey/client/spi/PostInvocationInterceptor.java index 89de325..88f0d5e 100644 --- a/core-client/src/main/java/org/glassfish/jersey/client/spi/PostInvocationInterceptor.java +++ b/core-client/src/main/java/org/glassfish/jersey/client/spi/PostInvocationInterceptor.java
@@ -33,7 +33,7 @@ * {@link jakarta.ws.rs.client.ClientResponseFilter ClientResponseFilters} are executed. * <p/> * It is ensured that all {@code PostInvocationInterceptors} are executed after the request, in the reverse order given by the - * {@link javax.annotation.Priority}, the higher the priority the later the execution. Any {@code Throwable} thrown when + * {@link jakarta.annotation.Priority}, the higher the priority the later the execution. Any {@code Throwable} thrown when * the {@link PostInvocationInterceptor#afterRequest(ClientRequestContext, ClientResponseContext)} or * {@link PostInvocationInterceptor#onException(ClientRequestContext, ExceptionContext)} is being processed is accumulated and * a multi RuntimeException with other {@link Throwable#addSuppressed(Throwable) exceptions supressed} is being thrown at the end
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/spi/PreInvocationInterceptor.java b/core-client/src/main/java/org/glassfish/jersey/client/spi/PreInvocationInterceptor.java index 2615b1b..198f21e 100644 --- a/core-client/src/main/java/org/glassfish/jersey/client/spi/PreInvocationInterceptor.java +++ b/core-client/src/main/java/org/glassfish/jersey/client/spi/PreInvocationInterceptor.java
@@ -30,7 +30,7 @@ * {@link jakarta.ws.rs.client.ClientRequestFilter} is invoked. * <p/> * It is ensured that all {@code PreInvocationInterceptors} are executed before the request, in the order given by the - * {@link javax.annotation.Priority}, the higher the priority the sooner the execution. Any {@code RuntimeException} thrown when + * {@link jakarta.annotation.Priority}, the higher the priority the sooner the execution. Any {@code RuntimeException} thrown when * the {@link PreInvocationInterceptor#beforeRequest(ClientRequestContext)} is being processed is accumulated and * a multi RuntimeException with other {@link Throwable#addSuppressed(Throwable) exceptions supressed} is being thrown. * <p/>
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/inject/Injections.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/Injections.java index e14136f..19177cf 100644 --- a/core-common/src/main/java/org/glassfish/jersey/internal/inject/Injections.java +++ b/core-common/src/main/java/org/glassfish/jersey/internal/inject/Injections.java
@@ -81,7 +81,7 @@ * @param clazz type of service to look for. * @param <T> type of service to look for. * @return instance of service with highest priority or {@code null} if service of given type cannot be found. - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority */ private static <T> Optional<T> lookupService(final Class<T> clazz) { List<RankedProvider<T>> providers = new LinkedList<>();
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/spi/AutoDiscoverable.java b/core-common/src/main/java/org/glassfish/jersey/internal/spi/AutoDiscoverable.java index 7848e2b..078fc67 100644 --- a/core-common/src/main/java/org/glassfish/jersey/internal/spi/AutoDiscoverable.java +++ b/core-common/src/main/java/org/glassfish/jersey/internal/spi/AutoDiscoverable.java
@@ -27,7 +27,7 @@ * META-INF/services} directory. * <p/> * Almost all Jersey {@code AutoDiscoverable} implementations have - * {@link #DEFAULT_PRIORITY} {@link javax.annotation.Priority priority} set. + * {@link #DEFAULT_PRIORITY} {@link jakarta.annotation.Priority priority} set. * * @author Michal Gajdos */
diff --git a/core-common/src/main/java/org/glassfish/jersey/model/ContractProvider.java b/core-common/src/main/java/org/glassfish/jersey/model/ContractProvider.java index 78950e3..4fdcb3c 100644 --- a/core-common/src/main/java/org/glassfish/jersey/model/ContractProvider.java +++ b/core-common/src/main/java/org/glassfish/jersey/model/ContractProvider.java
@@ -298,7 +298,7 @@ * @param contract provider contract. * @return provider priority. * - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority */ public int getPriority(final Class<?> contract) { if (contracts.containsKey(contract)) {
diff --git a/core-common/src/main/java/org/glassfish/jersey/model/internal/ComponentBag.java b/core-common/src/main/java/org/glassfish/jersey/model/internal/ComponentBag.java index b2d3fcb..12efe9f 100644 --- a/core-common/src/main/java/org/glassfish/jersey/model/internal/ComponentBag.java +++ b/core-common/src/main/java/org/glassfish/jersey/model/internal/ComponentBag.java
@@ -429,7 +429,7 @@ * * @param componentClass registered component class. * @param defaultPriority default component priority. If {@value ContractProvider#NO_PRIORITY}, - * the value from the component class {@link javax.annotation.Priority} annotation will be used + * the value from the component class {@link jakarta.annotation.Priority} annotation will be used * (if any). * @param contractMap map of contracts and their binding priorities. If {@code null}, the contracts will * gathered by introspecting the component class. Content of the contract map @@ -478,7 +478,7 @@ * * @param componentClass component class to create contract provider model for. * @param defaultPriority default component priority. If {@value ContractProvider#NO_PRIORITY}, - * the value from the component class {@link javax.annotation.Priority} annotation will be used + * the value from the component class {@link jakarta.annotation.Priority} annotation will be used * (if any). * @param contractMap map of contracts and their binding priorities. If {@code null}, the contracts will * gathered by introspecting the component class. Content of the contract map
diff --git a/core-common/src/main/java/org/glassfish/jersey/model/internal/ManagedObjectsFinalizer.java b/core-common/src/main/java/org/glassfish/jersey/model/internal/ManagedObjectsFinalizer.java index 80c9836..428ad60 100644 --- a/core-common/src/main/java/org/glassfish/jersey/model/internal/ManagedObjectsFinalizer.java +++ b/core-common/src/main/java/org/glassfish/jersey/model/internal/ManagedObjectsFinalizer.java
@@ -28,7 +28,7 @@ * Invokes {@link PreDestroy} methods on all registered objects, when the injection manager is shut down. * <p/> * Some objects managed by Jersey are created using {@link InjectionManager#createAndInitialize}. This means - * that such objects are created, dependencies injected and methods annotated with {@link javax.annotation.PostConstruct} + * that such objects are created, dependencies injected and methods annotated with {@link jakarta.annotation.PostConstruct} * invoked. Therefore methods annotated with {@link PreDestroy} should be invoked on such objects too, when they are destroyed. * <p/> * This service invokes {@link PreDestroy} on all registered objects when {@link InjectionManager#shutdown()} is invoked
diff --git a/core-common/src/main/java/org/glassfish/jersey/model/internal/RankedProvider.java b/core-common/src/main/java/org/glassfish/jersey/model/internal/RankedProvider.java index 8946a20..56b3470 100644 --- a/core-common/src/main/java/org/glassfish/jersey/model/internal/RankedProvider.java +++ b/core-common/src/main/java/org/glassfish/jersey/model/internal/RankedProvider.java
@@ -38,7 +38,7 @@ private final Set<Type> contractTypes; /** - * Creates a new {@code RankedProvider} instance. The rank of the provider is obtained from the {@link javax.annotation.Priority} + * Creates a new {@code RankedProvider} instance. The rank of the provider is obtained from the {@link jakarta.annotation.Priority} * annotation or is set to {@value jakarta.ws.rs.Priorities#USER} if the annotation is not present. * * @param provider service provider to create a {@code RankedProvider} instance from.
diff --git a/core-common/src/main/java/org/glassfish/jersey/spi/ExecutorServiceProvider.java b/core-common/src/main/java/org/glassfish/jersey/spi/ExecutorServiceProvider.java index a5b6173..d90c47a 100644 --- a/core-common/src/main/java/org/glassfish/jersey/spi/ExecutorServiceProvider.java +++ b/core-common/src/main/java/org/glassfish/jersey/spi/ExecutorServiceProvider.java
@@ -37,7 +37,7 @@ * it may not be desirable to shut down the released executor service in the {@link #dispose} method. Instead, to perform the * eventual shut-down procedure, the provider may either rely on an explicit invocation of it's specific clean-up method. * Since all Jersey providers operate in a <em>container</em> environment, a good clean-up strategy for a shared executor - * service provider implementation is to expose a {@link javax.annotation.PreDestroy @PreDestroy}-annotated method + * service provider implementation is to expose a {@link jakarta.annotation.PreDestroy @PreDestroy}-annotated method * that will be invoked for all instances managed by the container, before the container shuts down. * </p> * <p>
diff --git a/core-common/src/main/java/org/glassfish/jersey/spi/ScheduledThreadPoolExecutorProvider.java b/core-common/src/main/java/org/glassfish/jersey/spi/ScheduledThreadPoolExecutorProvider.java index 908b7ac..e805b23 100644 --- a/core-common/src/main/java/org/glassfish/jersey/spi/ScheduledThreadPoolExecutorProvider.java +++ b/core-common/src/main/java/org/glassfish/jersey/spi/ScheduledThreadPoolExecutorProvider.java
@@ -41,7 +41,7 @@ * it may not be desirable to shut down the released executor service in the {@link #dispose} method. Instead, to perform the * eventual shut-down procedure, the provider may either rely on an explicit invocation of it's specific clean-up method. * Since all Jersey providers operate in a <em>container</em> environment, a good clean-up strategy for a shared executor - * service provider implementation is to expose a {@link javax.annotation.PreDestroy @PreDestroy}-annotated method + * service provider implementation is to expose a {@link jakarta.annotation.PreDestroy @PreDestroy}-annotated method * that will be invoked for all instances managed by the container, before the container shuts down. * </p> * <p>
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/filter/RolesAllowedDynamicFeature.java b/core-server/src/main/java/org/glassfish/jersey/server/filter/RolesAllowedDynamicFeature.java index ab4982e..e443604 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/filter/RolesAllowedDynamicFeature.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/filter/RolesAllowedDynamicFeature.java
@@ -36,8 +36,8 @@ import org.glassfish.jersey.server.model.AnnotatedMethod; /** - * A {@link DynamicFeature} supporting the {@code javax.annotation.security.RolesAllowed}, - * {@code javax.annotation.security.PermitAll} and {@code javax.annotation.security.DenyAll} + * A {@link DynamicFeature} supporting the {@code jakarta.annotation.security.RolesAllowed}, + * {@code jakarta.annotation.security.PermitAll} and {@code jakarta.annotation.security.DenyAll} * on resource methods and sub-resource methods. * <p/> * The {@link jakarta.ws.rs.core.SecurityContext} is utilized, using the
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/model/ModelProcessor.java b/core-server/src/main/java/org/glassfish/jersey/server/model/ModelProcessor.java index 5f067b9..b645520 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/model/ModelProcessor.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/model/ModelProcessor.java
@@ -32,7 +32,7 @@ * processor will be executed with resource model processed by the previous model processor. The first model * processor in the chain will be invoked with the initial resource model from which the application was initiated. * <p/> - * Model processors implementations can define {@link javax.annotation.Priority binding priority} + * Model processors implementations can define {@link jakarta.annotation.Priority binding priority} * to define the order in which they are executed (processors with a lower priority is invoked * before processor with a higher priority). The highest possible priority (Integer.MAX_VALUE) is used for * model processor which enhance resource models by the default OPTIONS method defined by JAX-RS specification and therefore
diff --git a/docs/src/main/docbook/client.xml b/docs/src/main/docbook/client.xml index e0b01cb..d57603e 100644 --- a/docs/src/main/docbook/client.xml +++ b/docs/src/main/docbook/client.xml
@@ -546,8 +546,8 @@ do require running on another thread, should be executed using provided services. </para> <para> - Default values do depend on the environment - in Java EE container, it has to be &jee6.javax.enterprise.concurrent.ManagedExecutorService; - and &jee6.javax.enterprise.concurrent.ManagedScheduledExecutorService;, for Java SE it would be + Default values do depend on the environment - in Java EE container, it has to be &jee6.jakarta.enterprise.concurrent.ManagedExecutorService; + and &jee6.jakarta.enterprise.concurrent.ManagedScheduledExecutorService;, for Java SE it would be <literal>ForkJoinPool.commonPool</literal> for Executor service and something undefined for Scheduled executor service. </para>
diff --git a/docs/src/main/docbook/entity-filtering.xml b/docs/src/main/docbook/entity-filtering.xml index 7bf2570..e11ac64 100644 --- a/docs/src/main/docbook/entity-filtering.xml +++ b/docs/src/main/docbook/entity-filtering.xml
@@ -115,7 +115,7 @@ </listitem> <listitem> <para>&jersey.message.filtering.SecurityEntityFilteringFeature;</para> - <para>Filtering based on security (<literal>javax.annotation.security</literal>) and entity-filtering + <para>Filtering based on security (<literal>jakarta.annotation.security</literal>) and entity-filtering annotations.</para> </listitem> <listitem> @@ -660,13 +660,13 @@ </section> <section xml:id="ef.security.annotations"> - <title>Role-based Entity Filtering using (<literal>javax.annotation.security</literal>) annotations</title> + <title>Role-based Entity Filtering using (<literal>jakarta.annotation.security</literal>) annotations</title> <para> Filtering the content sent to the client (or server) based on the authorized security roles is a commonly required use case. By registering &jersey.message.filtering.SecurityEntityFilteringFeature; you can leverage the Jersey Entity Filtering facility in connection with standard - <literal>javax.annotation.security</literal> annotations exactly the same way as you would with custom + <literal>jakarta.annotation.security</literal> annotations exactly the same way as you would with custom entity-filtering annotations described in previous chapters. Supported security annotations are: <itemizedlist>
diff --git a/docs/src/main/docbook/filters.xml b/docs/src/main/docbook/filters.xml index a32b7c6..357771c 100644 --- a/docs/src/main/docbook/filters.xml +++ b/docs/src/main/docbook/filters.xml
@@ -623,7 +623,7 @@ <para>In case you register more filters and interceptors you might want to define an exact order in which they should be invoked. The order can be controlled by the <literal>@Priority</literal> annotation defined - by the <literal>javax.annotation.Priority</literal> class. The annotation accepts an integer parameter of priority. + by the <literal>jakarta.annotation.Priority</literal> class. The annotation accepts an integer parameter of priority. Providers used in request processing (&lit.jaxrs.container.ContainerRequestFilter;, &lit.jaxrs.client.ClientRequestFilter;) as well as entity interceptors (&lit.jaxrs.ReaderInterceptor;, &lit.jaxrs.WriterInterceptor;) are sorted based on the priority in an ascending manner. So, a request filter with
diff --git a/docs/src/main/docbook/getting-started.xml b/docs/src/main/docbook/getting-started.xml index d2e34c2..4b0f88e 100644 --- a/docs/src/main/docbook/getting-started.xml +++ b/docs/src/main/docbook/getting-started.xml
@@ -457,7 +457,7 @@ [INFO] Copying jetty-servlet-9.0.6.v20130930.jar to .../simple-heroku-webapp/target/dependency/jetty-servlet-9.0.6.v20130930.jar [INFO] Copying jakarta.inject-2.2.0-b21.jar to .../simple-heroku-webapp/target/dependency/jakarta.inject-2.2.0-b21.jar [INFO] Copying javax.servlet-3.0.0.v201112011016.jar to .../simple-heroku-webapp/target/dependency/javax.servlet-3.0.0.v201112011016.jar - [INFO] Copying javax.annotation-api-1.2.jar to .../simple-heroku-webapp/target/dependency/javax.annotation-api-1.2.jar + [INFO] Copying jakarta.annotation-api-1.2.jar to .../simple-heroku-webapp/target/dependency/jakarta.annotation-api-1.2.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ @@ -580,7 +580,7 @@ [INFO] [INFO] --- maven-dependency-plugin:2.1:copy-dependencies (copy-dependencies) @ simple-heroku-webapp --- [INFO] Copying guava-14.0.1.jar to /tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd/target/dependency/guava-14.0.1.jar - [INFO] Copying javax.annotation-api-1.2.jar to /tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd/target/dependency/javax.annotation-api-1.2.jar + [INFO] Copying jakarta.annotation-api-1.2.jar to /tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd/target/dependency/jakarta.annotation-api-1.2.jar [INFO] Copying validation-api-1.1.0.Final.jar to /tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd/target/dependency/validation-api-1.1.0.Final.jar [INFO] Copying jakarta.ws.rs-api-2.0.jar to /tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd/target/dependency/jakarta.ws.rs-api-2.0.jar [INFO] Copying jetty-http-9.0.6.v20130930.jar to /tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd/target/dependency/jetty-http-9.0.6.v20130930.jar
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent index 4c61226..8eee614 100644 --- a/docs/src/main/docbook/jersey.ent +++ b/docs/src/main/docbook/jersey.ent
@@ -276,9 +276,9 @@ <!ENTITY jdk8.ForkJoinPool.commonPool "<link xlink:href='&jdk8.javadoc.uri;/java/util/concurrent/ForkJoinPool.html#commonPool--'>ForkJoinPool#commonPool()</link>"> <!ENTITY jdk8.Stream "<link xlink:href='&jdk8.javadoc.uri;/java/util/stream/Stream.html'>Stream</link>"> -<!ENTITY jee6.annotations.DenyAll "<link xlink:href='&jee.javadoc.uri;/javax/annotation/security/DenyAll.html'>@DenyAll</link>"> -<!ENTITY jee6.annotations.PermitAll "<link xlink:href='&jee.javadoc.uri;/javax/annotation/security/PermitAll.html'>@PermitAll</link>"> -<!ENTITY jee6.annotations.RolesAllowed "<link xlink:href='&jee.javadoc.uri;/javax/annotation/security/RolesAllowed.html'>@RolesAllowed</link>"> +<!ENTITY jee6.annotations.DenyAll "<link xlink:href='&jee.javadoc.uri;/jakarta.annotation/security/DenyAll.html'>@DenyAll</link>"> +<!ENTITY jee6.annotations.PermitAll "<link xlink:href='&jee.javadoc.uri;/jakarta.annotation/security/PermitAll.html'>@PermitAll</link>"> +<!ENTITY jee6.annotations.RolesAllowed "<link xlink:href='&jee.javadoc.uri;/jakarta.annotation/security/RolesAllowed.html'>@RolesAllowed</link>"> <!ENTITY jee6.inject.Singleton "<link xlink:href='&jee.javadoc.uri;/jakarta.inject/Singleton.html'>@Singleton</link>"> <!ENTITY jee6.jakarta.inject.Inject "<link xlink:href='&jee.javadoc.uri;/jakarta.inject/Inject.html'>@Inject</link>"> <!ENTITY jee6.jakarta.inject.Provider "<link xlink:href='&jee.javadoc.uri;/jakarta.inject/Provider.html'>Provider</link>"> @@ -286,8 +286,8 @@ <!ENTITY jee6.servlet.HttpServletRequest "<link xlink:href='&jee.javadoc.uri;/javax/servlet/http/HttpServletRequest.html'>HttpServletRequest</link>"> <!ENTITY jee6.servlet.HttpSession "<link xlink:href='&jee.javadoc.uri;/javax/servlet/http/HttpSession.html'>HttpSession</link>"> -<!ENTITY jee6.javax.enterprise.concurrent.ManagedExecutorService "<link xlink:href='&jee.javadoc.uri;/javax/enterprise/concurrent/ManagedExecutorService.html'>ManagedExecutorService</link>"> -<!ENTITY jee6.javax.enterprise.concurrent.ManagedScheduledExecutorService "<link xlink:href='&jee.javadoc.uri;/javax/enterprise/concurrent/ManagedScheduledExecutorService.html'>ManagedScheduledExecutorService</link>"> +<!ENTITY jee6.jakarta.enterprise.concurrent.ManagedExecutorService "<link xlink:href='&jee.javadoc.uri;/jakarta.enterprise/concurrent/ManagedExecutorService.html'>ManagedExecutorService</link>"> +<!ENTITY jee6.jakarta.enterprise.concurrent.ManagedScheduledExecutorService "<link xlink:href='&jee.javadoc.uri;/jakarta.enterprise/concurrent/ManagedScheduledExecutorService.html'>ManagedScheduledExecutorService</link>"> <!ENTITY jersey.apache.ApacheConnectorProvider "<link xlink:href='&jersey.javadoc.uri.prefix;/apache/connector/ApacheConnectorProvider.html'>ApacheConnectorProvider</link>"> <!ENTITY jersey.client.ChunkParser "<link xlink:href='&jersey.javadoc.uri.prefix;/client/ChunkParser.html'>ChunkParser</link>">
diff --git a/docs/src/main/docbook/security.xml b/docs/src/main/docbook/security.xml index 492fdcb..5f56835 100644 --- a/docs/src/main/docbook/security.xml +++ b/docs/src/main/docbook/security.xml
@@ -171,7 +171,7 @@ </section> <section xml:id="annotation-based-security"> - <title>Securing JAX-RS resources with standard <literal>javax.annotation.security</literal> annotations</title> + <title>Securing JAX-RS resources with standard <literal>jakarta.annotation.security</literal> annotations</title> <para> With Jersey you can define the access to resources based on the user group using annotations. You @@ -202,10 +202,10 @@ </para> <para> Once the feature is registered, you can use annotations from package - <literal>javax.annotation.security</literal> defined by JSR-250. See the following example. + <literal>jakarta.annotation.security</literal> defined by JSR-250. See the following example. <example> - <title>Applying <literal>javax.annotation.security</literal> to JAX-RS resource methods.</title> + <title>Applying <literal>jakarta.annotation.security</literal> to JAX-RS resource methods.</title> <programlisting language="java" linenumbering="numbered">< -- [Role-based Entity Filtering using (javax.annotation.security) +- [Role-based Entity Filtering using (jakarta.annotation.security) annotations](https://eclipse-ee4j.github.io/jersey.github.io/documentation/latest/entity-filtering.html#ef.security.annotations) Contents
diff --git a/examples/etc/gf-project-src-pom.xsl b/examples/etc/gf-project-src-pom.xsl index de418c5..f43d606 100644 --- a/examples/etc/gf-project-src-pom.xsl +++ b/examples/etc/gf-project-src-pom.xsl
@@ -33,8 +33,8 @@ or pom:artifactId='jersey-bean-validation' or pom:groupId='com.sun.xml.bind' or pom:groupId='org.codehaus.jettison' - or pom:groupId='javax.annotation' - or pom:groupId='javax.enterprise' + or pom:groupId='jakarta.annotation' + or pom:groupId='jakarta.enterprise' or pom:groupId='javax.servlet' or pom:groupId='jakarta.ws.rs']/pom:scope[text()!=test]"> <scope>provided</scope> @@ -51,8 +51,8 @@ or pom:groupId='com.sun.xml.bind' or pom:groupId='jakarta.validation' or pom:groupId='org.codehaus.jettison' - or pom:groupId='javax.annotation' - or pom:groupId='javax.enterprise' + or pom:groupId='jakarta.annotation' + or pom:groupId='jakarta.enterprise' or pom:groupId='javax.servlet' or pom:groupId='jakarta.ws.rs']"> <xsl:copy>
diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java index 0dfe63d..14d5296 100644 --- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java +++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
@@ -97,11 +97,11 @@ public static Option[] configuration() { List<Option> options = Arrays.asList(options( // systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"), - systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"), + systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"), systemProperty(JAXRS_RUNTIME_DELEGATE_PROPERTY).value("org.glassfish.jersey.internal.RuntimeDelegateImpl"), systemProperty(JAXRS_CLIENT_BUILDER).value("org.glassfish.jersey.client.JerseyClientBuilder"), - // javax.annotation must go first! + // jakarta.annotation must go first! mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(), //JAXB-API mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(),
diff --git a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/App.java b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/App.java index fba0ab4..e3b5343 100644 --- a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/App.java +++ b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/App.java
@@ -19,7 +19,7 @@ import java.util.logging.Logger; import jakarta.annotation.ManagedBean; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.UriInfo;
diff --git a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/AppScopedResource.java b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/AppScopedResource.java index 639bbfe..c2202df 100644 --- a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/AppScopedResource.java +++ b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/AppScopedResource.java
@@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces;
diff --git a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/CustomInterceptor.java b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/CustomInterceptor.java index ea456a7..43de035 100644 --- a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/CustomInterceptor.java +++ b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/CustomInterceptor.java
@@ -12,7 +12,7 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject;
diff --git a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/HelloWorldResource.java b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/HelloWorldResource.java index b3a275d..061ea38 100644 --- a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/HelloWorldResource.java +++ b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/HelloWorldResource.java
@@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.helloworld; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path;
diff --git a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedBean.java b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedBean.java index 84371c8..885e373 100644 --- a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedBean.java +++ b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedBean.java
@@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.helloworld; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; /** * Request scoped CDI bean. Serves as a storage
diff --git a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedResource.java b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedResource.java index 00cba34..184bf0b 100644 --- a/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedResource.java +++ b/examples/helloworld-weld/src/main/java/org/glassfish/jersey/examples/helloworld/RequestScopedResource.java
@@ -21,7 +21,7 @@ import jakarta.ws.rs.container.AsyncResponse; import jakarta.ws.rs.container.Suspended; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.UriInfo;
diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java index c995f9e..b8ae63c 100644 --- a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java +++ b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
@@ -132,7 +132,7 @@ // mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.4"), // mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.4"), - // javax.annotation must go first! + // jakarta.annotation must go first! mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(), // pax exam dependencies mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
diff --git a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java index 242809d..497e8c0 100644 --- a/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java +++ b/examples/osgi-http-service/functional-test/src/test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
@@ -86,7 +86,7 @@ systemProperty("org.osgi.service.http.port").value(String.valueOf(port)), systemProperty(BundleLocationProperty).value(bundleLocation), systemProperty("jersey.config.test.container.port").value(String.valueOf(port)), - systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"), + systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"), systemProperty(JAXRS_RUNTIME_DELEGATE_PROPERTY).value("org.glassfish.jersey.internal.RuntimeDelegateImpl"), systemProperty(JAXRS_CLIENT_BUILDER).value("org.glassfish.jersey.client.JerseyClientBuilder"), @@ -97,7 +97,7 @@ // mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.4"), // mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.4"), - // javax.annotation has to go first! + // jakarta.annotation has to go first! mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(), mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml index 9c80e93..798b3aa 100644 --- a/ext/bean-validation/pom.xml +++ b/ext/bean-validation/pom.xml
@@ -101,8 +101,8 @@ </exclusions> </dependency> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> <optional>true</optional> </dependency> <dependency>
diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java index 271015d..4b7412e 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java
@@ -15,11 +15,11 @@ */ package org.glassfish.jersey.server.validation.internal; -import javax.annotation.PostConstruct; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorFactory; -import javax.ws.rs.container.ResourceContext; -import javax.ws.rs.core.Context; +import jakarta.annotation.PostConstruct; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorFactory; +import jakarta.ws.rs.container.ResourceContext; +import jakarta.ws.rs.core.Context; /** * {@link ConstraintValidatorFactory} implementation that uses {@link InjectingConstraintValidatorFactory}
diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java index 136a007..0853579 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java
@@ -8,10 +8,10 @@ package org.glassfish.jersey.server.validation.internal; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionTarget; /** * @author Hardy Ferentschik
diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java index d0ad811..96c8060 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java
@@ -10,10 +10,10 @@ import org.glassfish.jersey.ext.cdi1x.internal.CdiUtil; -import javax.annotation.PostConstruct; -import javax.enterprise.inject.spi.BeanManager; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorFactory; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorFactory; import java.util.Collections; import java.util.IdentityHashMap; import java.util.Map;
diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java index 933c030..dc4de93 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java
@@ -260,7 +260,7 @@ // if CDI is available use composite factiry if (AccessController.doPrivileged( - ReflectionHelper.classForNamePA("javax.enterprise.inject.spi.BeanManager")) != null) { + ReflectionHelper.classForNamePA("jakarta.enterprise.inject.spi.BeanManager")) != null) { // Composite Configuration - due to PAYARA-2491 // https://github.com/payara/Payara/issues/2245 context.constraintValidatorFactory(resourceContext.getResource(
diff --git a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtil.java b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtil.java index d3a731d..2057dbf 100644 --- a/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtil.java +++ b/ext/cdi/jersey-cdi1x/src/main/java/org/glassfish/jersey/ext/cdi1x/internal/CdiUtil.java
@@ -100,7 +100,7 @@ * @param clazz type of service to look for. * @param <T> type of service to look for * @return instance of service with highest priority or {@code null} if service of given type cannot be found. - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority */ static <T> T lookupService(final Class<T> clazz) { final List<RankedProvider<T>> providers = new LinkedList<>();
diff --git a/ext/cdi/jersey-weld2-se/pom.xml b/ext/cdi/jersey-weld2-se/pom.xml index acb966a..2d3880b 100644 --- a/ext/cdi/jersey-weld2-se/pom.xml +++ b/ext/cdi/jersey-weld2-se/pom.xml
@@ -48,6 +48,10 @@ <artifactId>jersey-cdi1x</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> + </dependency> </dependencies> <build>
diff --git a/ext/cdi/jersey-weld2-se/src/main/java/org/glassfish/jersey/weld/se/WeldRequestScope.java b/ext/cdi/jersey-weld2-se/src/main/java/org/glassfish/jersey/weld/se/WeldRequestScope.java index 34ea6d8..d052e2d 100644 --- a/ext/cdi/jersey-weld2-se/src/main/java/org/glassfish/jersey/weld/se/WeldRequestScope.java +++ b/ext/cdi/jersey-weld2-se/src/main/java/org/glassfish/jersey/weld/se/WeldRequestScope.java
@@ -19,7 +19,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import org.glassfish.jersey.ext.cdi1x.internal.JerseyVetoed;
diff --git a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SecurityEntityFilteringFeature.java b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SecurityEntityFilteringFeature.java index 8eeff6f..fc97d8d 100644 --- a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SecurityEntityFilteringFeature.java +++ b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/SecurityEntityFilteringFeature.java
@@ -24,14 +24,14 @@ import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature; /** - * {@link Feature} used to add support for Java Security annotations (<code>javax.annotation.security</code>) for Entity Data + * {@link Feature} used to add support for Java Security annotations (<code>jakarta.annotation.security</code>) for Entity Data * Filtering feature. * <p> * Supported annotations are: * <ul> - * <li>{@link javax.annotation.security.PermitAll}</li> - * <li>{@link javax.annotation.security.RolesAllowed}</li> - * <li>{@link javax.annotation.security.DenyAll}</li> + * <li>{@link jakarta.annotation.security.PermitAll}</li> + * <li>{@link jakarta.annotation.security.RolesAllowed}</li> + * <li>{@link jakarta.annotation.security.DenyAll}</li> * </ul> * </p> * <p>
diff --git a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/package-info.java b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/package-info.java index 1f46858..6780ae8 100644 --- a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/package-info.java +++ b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/package-info.java
@@ -23,7 +23,7 @@ * <li>{@link org.glassfish.jersey.message.filtering.EntityFilteringFeature} - adds support for entity-filtering * annotations based on {@link org.glassfish.jersey.message.filtering.EntityFiltering} meta-annotation.</li> * <li>{@link org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature} - add support for entity-filtering using - * Java Security annotations (<code>javax.annotation.security</code>).</li> + * Java Security annotations (<code>jakarta.annotation.security</code>).</li> * </ul> * <p/> * To define own entity-filtering annotations, refer to the {@link org.glassfish.jersey.message.filtering.EntityFiltering}
diff --git a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/ScopeResolver.java b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/ScopeResolver.java index d4652de..eca27f9 100644 --- a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/ScopeResolver.java +++ b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/ScopeResolver.java
@@ -31,8 +31,8 @@ * <ul> * <li><code>@MyDetailedView</code> -> <code>my.package.MyDetailedView</code></li> * <li> - * <code>@RolesAllowed({"manager", "user"})</code> -> <code>javax.annotation.security.RolesAllowed_manager</code> and - * <code>javax.annotation.security.RolesAllowed_user</code> + * <code>@RolesAllowed({"manager", "user"})</code> -> <code>jakarta.annotation.security.RolesAllowed_manager</code> and + * <code>jakarta.annotation.security.RolesAllowed_user</code> * </li> * </ul> * <p/>
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterceptorInvocationContext.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterceptorInvocationContext.java index 9533cf2..7d6a092 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterceptorInvocationContext.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterceptorInvocationContext.java
@@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; -import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.inject.spi.Interceptor; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.Interceptor; import javax.interceptor.InvocationContext; import jakarta.ws.rs.client.WebTarget;
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterfaceModel.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterfaceModel.java index 3e74889..f8e0d5c 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterfaceModel.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/InterfaceModel.java
@@ -26,8 +26,8 @@ import java.util.Set; import java.util.stream.Collectors; -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 jakarta.ws.rs.Consumes; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces;
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/MethodModel.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/MethodModel.java index e4bc8e9..4944f63 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/MethodModel.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/MethodModel.java
@@ -38,9 +38,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InterceptionType; -import javax.enterprise.inject.spi.Interceptor; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InterceptionType; +import jakarta.enterprise.inject.spi.Interceptor; import javax.json.JsonValue; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.CookieParam;
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientExtension.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientExtension.java index 6822684..4074b12 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientExtension.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientExtension.java
@@ -21,16 +21,16 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.DeploymentException; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.ProcessAnnotatedType; -import javax.enterprise.inject.spi.ProcessInjectionPoint; -import javax.enterprise.inject.spi.WithAnnotations; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.ProcessAnnotatedType; +import jakarta.enterprise.inject.spi.ProcessInjectionPoint; +import jakarta.enterprise.inject.spi.WithAnnotations; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java index 4d91e90..e790d8f 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientModel.java
@@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.ext.ParamConverterProvider;
diff --git a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java index d0c75ec..a95e7fe 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java +++ b/ext/microprofile/mp-rest-client/src/main/java/org/glassfish/jersey/microprofile/restclient/RestClientProducer.java
@@ -40,16 +40,16 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.DeploymentException; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.PassivationCapable; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.DeploymentException; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.PassivationCapable; +import jakarta.enterprise.util.AnnotationLiteral; import javax.net.ssl.HostnameVerifier; import org.eclipse.microprofile.config.Config;
diff --git a/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProvider.java b/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProvider.java index 8b4ce1c..b79a196 100644 --- a/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProvider.java +++ b/media/json-jackson/src/main/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProvider.java
@@ -21,7 +21,7 @@ import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider; import java.util.Objects; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** * Entity Data provider based on Jackson JSON provider.
diff --git a/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProviderTest.java b/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProviderTest.java index 281d4c4..71ea96f 100644 --- a/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProviderTest.java +++ b/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProviderTest.java
@@ -21,7 +21,7 @@ import org.glassfish.jersey.test.JerseyTest; import org.junit.Test; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import static junit.framework.TestCase.assertEquals;
diff --git a/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/model/ServiceTest.java b/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/model/ServiceTest.java index 027064b..3e8f981 100644 --- a/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/model/ServiceTest.java +++ b/media/json-jackson/src/test/java/org/glassfish/jersey/jackson/internal/model/ServiceTest.java
@@ -19,10 +19,10 @@ import com.fasterxml.jackson.annotation.JsonGetter; import java.util.Optional; -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("/entity/") public final class ServiceTest {
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java index 18fdcb9..85ac3bd 100644 --- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java +++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java
@@ -27,11 +27,11 @@ import org.junit.BeforeClass; import org.junit.Test; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.io.PrintStream;
diff --git a/tests/integration/JERSEY-2988/src/main/java/org/glassfish/jersey/tests/integration/jersey2988/ContextAwareBean.java b/tests/integration/JERSEY-2988/src/main/java/org/glassfish/jersey/tests/integration/jersey2988/ContextAwareBean.java index 1a0d931..9a3b6e5 100644 --- a/tests/integration/JERSEY-2988/src/main/java/org/glassfish/jersey/tests/integration/jersey2988/ContextAwareBean.java +++ b/tests/integration/JERSEY-2988/src/main/java/org/glassfish/jersey/tests/integration/jersey2988/ContextAwareBean.java
@@ -20,7 +20,7 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ContextAwareBean {
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiApplication.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiApplication.java index 5cc9bd8..504a386 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiApplication.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiApplication.java
@@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiFieldInjectedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiFieldInjectedResource.java index 104088c..a3b4eab 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiFieldInjectedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiFieldInjectedResource.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.cdi.bv; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.validation.ConstraintViolationException;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiOldFashionedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiOldFashionedResource.java index 01107d6..56fea2c 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiOldFashionedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiOldFashionedResource.java
@@ -20,7 +20,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.QueryParam; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.validation.constraints.NotNull; /**
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiPropertyInjectedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiPropertyInjectedResource.java index 8628d82..9f0072b 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiPropertyInjectedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiPropertyInjectedResource.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.cdi.bv; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.validation.constraints.NotNull; import jakarta.ws.rs.GET;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationInterceptor.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationInterceptor.java index 903e35a..492cafe 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationInterceptor.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationInterceptor.java
@@ -19,7 +19,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.validation.ConstraintViolationException; import jakarta.validation.ValidationException;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationResult.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationResult.java index a55b758..86262c2 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationResult.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/CdiValidationResult.java
@@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.validation.ConstraintViolation; /**
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2Application.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2Application.java index 0428a57..250fb2f 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2Application.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2Application.java
@@ -18,7 +18,7 @@ import jakarta.ws.rs.ApplicationPath; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import org.glassfish.jersey.internal.inject.AbstractBinder; import org.glassfish.jersey.process.internal.RequestScoped;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2FieldInjectedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2FieldInjectedResource.java index cc8bf35..8e70a49 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2FieldInjectedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2FieldInjectedResource.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.cdi.bv; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.validation.constraints.NotNull; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2OldFashionedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2OldFashionedResource.java index 756b9c8..2bb1623 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2OldFashionedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2OldFashionedResource.java
@@ -20,7 +20,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.QueryParam; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.validation.constraints.NotNull; /**
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ParamInjectedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ParamInjectedResource.java index 90d54bc..6964a53 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ParamInjectedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ParamInjectedResource.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.cdi.bv; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.validation.constraints.NotNull; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2PropertyInjectedResource.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2PropertyInjectedResource.java index 71a5cdf..f47f6a8 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2PropertyInjectedResource.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2PropertyInjectedResource.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.cdi.bv; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.validation.constraints.NotNull; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationInterceptor.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationInterceptor.java index 2d54385..72ec78b 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationInterceptor.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationInterceptor.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Context; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.inject.Singleton;
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationResult.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationResult.java index 9969c4e..ff21135 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationResult.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/Hk2ValidationResult.java
@@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.validation.ConstraintViolation; /**
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/NonJaxRsValidatedBean.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/NonJaxRsValidatedBean.java index c4e2630..9dd863a 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/NonJaxRsValidatedBean.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/NonJaxRsValidatedBean.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.cdi.bv; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.validation.constraints.NotNull; /**
diff --git a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/ValidationResultUtil.java b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/ValidationResultUtil.java index 3ec25b7..6bf3ab3 100644 --- a/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/ValidationResultUtil.java +++ b/tests/integration/cdi-integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/ValidationResultUtil.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Modifier; import java.util.Set; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; import jakarta.validation.ConstraintViolation;
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedBean.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedBean.java index c4173d0..5fed0c3 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedBean.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedBean.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.integration.j376; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.UriInfo;
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedResource.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedResource.java index bddafdb..b5e82a6 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedResource.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ApplicationScopedResource.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.integration.j376; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.BeanParam; import jakarta.ws.rs.GET;
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ConstructorInjectionResource.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ConstructorInjectionResource.java index a8bfe4d..2077d30 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ConstructorInjectionResource.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/ConstructorInjectionResource.java
@@ -21,7 +21,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.validation.Valid;
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FieldInjectionResource.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FieldInjectionResource.java index cdc0c41..a8a978a 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FieldInjectionResource.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FieldInjectionResource.java
@@ -21,7 +21,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.validation.Valid; import jakarta.ws.rs.BeanParam;
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FormDataBean.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FormDataBean.java index 9b6ec53..ad1e9d5 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FormDataBean.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/FormDataBean.java
@@ -21,7 +21,7 @@ import jakarta.ws.rs.core.UriInfo; import jakarta.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; @@ -59,7 +59,7 @@ } /** - * Exposes the state of injected {@code UriInfo} in the time of the call of {@link javax.annotation.PostConstruct} + * Exposes the state of injected {@code UriInfo} in the time of the call of {@link jakarta.annotation.PostConstruct} * annotated method. The returned value will be used in test to ensure, that {@code UriInfo} is injected in time * * @return path injected via {@code UriInfo} at the time-point of the {@link #postConstruct()} method call.
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/MethodInjectionResource.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/MethodInjectionResource.java index 81f7bf0..0c65b10 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/MethodInjectionResource.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/MethodInjectionResource.java
@@ -22,7 +22,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; import jakarta.validation.Valid;
diff --git a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/SecondBean.java b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/SecondBean.java index b815903..d7c2582 100644 --- a/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/SecondBean.java +++ b/tests/integration/j-376/src/main/java/org/glassfish/jersey/tests/integration/j376/SecondBean.java
@@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.integration.j376; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; /** * Bean to be injected into another bean by CDI.
diff --git a/tests/integration/jersey-4099/src/main/java/org/glassfish/jersey/tests/integration/jersey4099/MyResource.java b/tests/integration/jersey-4099/src/main/java/org/glassfish/jersey/tests/integration/jersey4099/MyResource.java index 9dacd53..0bbb981 100644 --- a/tests/integration/jersey-4099/src/main/java/org/glassfish/jersey/tests/integration/jersey4099/MyResource.java +++ b/tests/integration/jersey-4099/src/main/java/org/glassfish/jersey/tests/integration/jersey4099/MyResource.java
@@ -15,7 +15,7 @@ */ package org.glassfish.jersey.tests.integration.jersey4099; -import javax.enterprise.context.RequestScoped; +import jakarta.enterprise.context.RequestScoped; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path;
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index ae4d984..9ac3790 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml
@@ -368,19 +368,6 @@ <profiles> <profile> - <id>jdk11dependency</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.activation</groupId> - <artifactId>jakarta.activation</artifactId> - <version>${jakarta.activation.version}</version> - </dependency> - </dependencies> - </profile> - <profile> <id>testsSkipJdk8</id> <activation> <jdk>[1.8,11)</jdk>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java index 7e45238..b5573f9 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
@@ -137,11 +137,11 @@ // systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("FINEST"), systemProperty("org.osgi.service.http.port").value(String.valueOf(port)), systemProperty(TestProperties.CONTAINER_PORT).value(String.valueOf(port)), - systemProperty("org.osgi.framework.system.packages.extra").value("javax.annotation"), + systemProperty("org.osgi.framework.system.packages.extra").value("jakarta.annotation"), systemProperty(JAXRS_RUNTIME_DELEGATE_PROPERTY).value("org.glassfish.jersey.internal.RuntimeDelegateImpl"), systemProperty(JAXRS_CLIENT_BUILDER).value("org.glassfish.jersey.client.JerseyClientBuilder"), - // javax.annotation has to go first! + // jakarta.annotation has to go first! mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(), mavenBundle().groupId("jakarta.xml.bind").artifactId("jakarta.xml.bind-api").versionAsInProject(), junitBundles(),