From 75ba46e23c2c97e2c48a99d7c8edbf0e54fcaa7b Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 2 Apr 2020 11:43:41 +0200 Subject: [PATCH 1/5] JAXB api/ri, parent pom versions update Signed-off-by: Maxim Nesen --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e31cb39236..43d6799dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.eclipse.ee4j project - 1.0.5 + 1.0.6 org.glassfish.jersey @@ -2106,8 +2106,8 @@ 1.2.5 2.2.3 2.0.2 - 2.3.2 - 2.3.2 + 3.0.0-RC2 + 3.0.0-M1 1.0.2 3.0 3.0.0-M1 From 76a4163256bc8a837201e8c1dddc0f7a3bdd9400 Mon Sep 17 00:00:00 2001 From: jansupol <15908245+jansupol@users.noreply.github.com> Date: Fri, 27 Mar 2020 11:49:54 +0100 Subject: [PATCH 2/5] Adopt ee4j parent 1.0.6 (#4412) * Adopt ee4j parent 1.0.6 Signed-off-by: Jan Supol --- bom/pom.xml | 2 +- tools/jersey-release-notes-maven-plugin/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index f2dbd59c67..9522a3808b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -24,7 +24,7 @@ org.eclipse.ee4j project - 1.0.5 + 1.0.6 diff --git a/tools/jersey-release-notes-maven-plugin/pom.xml b/tools/jersey-release-notes-maven-plugin/pom.xml index ad1dcdc165..39aac79a0b 100644 --- a/tools/jersey-release-notes-maven-plugin/pom.xml +++ b/tools/jersey-release-notes-maven-plugin/pom.xml @@ -1,7 +1,7 @@ + jersey-bean-validation" > jersey-declarative-linking" > @@ -362,10 +362,10 @@ ValidationFeature"> AbstractRxInvoker"> Rx"> -Rx.from(Client,Class)"> -Rx.from(Client,Class,ExecutorService)"> -Rx.from(WebTarget,Class)"> -Rx.from(WebTarget,Class,ExecutorService)"> +Rx.from(Client,Class)"> +Rx.from(Client,Class,ExecutorService)"> +Rx.from(WebTarget,Class)"> +Rx.from(WebTarget,Class,ExecutorService)"> Rx.newClient(Class)"> Rx.newClient(Class,ExecutorService)"> RxClient"> @@ -593,9 +593,9 @@ TestContainerFactory"> ContainerRequestBuilder"> LoopBackConnectorProvider"> -SseEventSource.Builder"> -SseEventSource"> -InboundSseEvent"> +SseEventSource.Builder"> +SseEventSource"> +InboundSseEvent"> JERSEY-2838"> diff --git a/docs/src/main/docbook/monitoring.xml b/docs/src/main/docbook/monitoring.xml index 9e8245141d..cb542aa274 100644 --- a/docs/src/main/docbook/monitoring.xml +++ b/docs/src/main/docbook/monitoring.xml @@ -885,7 +885,7 @@ X-Jersey-Tracing-008: FINISHED [ ---- / 183.79 ms | ---- %] Response status: ... X-Jersey-Tracing-033: WI [ 0.00 / 23.39 ms | 0.02 %] [org.glassfish.jersey.server.mvc.internal.TemplateMethodInterceptor @141bcd49 #4000] BEFORE context.proceed() X-Jersey-Tracing-034: WI [ 0.01 / 23.42 ms | 0.02 %] [org.glassfish.jersey.filter.LoggingFilter @2d427def #-2147483648] BEFORE context.proceed() -X-Jersey-Tracing-035: MBW [ ---- / 23.45 ms | ---- %] Find MBW for type=[org.glassfish.jersey.server.mvc.internal.ImplicitViewable] genericType=[org.glassfish.jersey.server.mvc.internal.ImplicitViewable] mediaType=[[javax.ws.rs.core.MediaType @7bfbfeae]] annotations=[] +X-Jersey-Tracing-035: MBW [ ---- / 23.45 ms | ---- %] Find MBW for type=[org.glassfish.jersey.server.mvc.internal.ImplicitViewable] genericType=[org.glassfish.jersey.server.mvc.internal.ImplicitViewable] mediaType=[[jakarta.ws.rs.core.MediaType @7bfbfeae]] annotations=[] X-Jersey-Tracing-036: MBW [ ---- / 23.52 ms | ---- %] [org.glassfish.jersey.server.mvc.internal.ViewableMessageBodyWriter @78b353d4] IS writeable X-Jersey-Tracing-037: MVC [ ---- / 24.05 ms | ---- %] Forwarding view to JSP page [/org/glassfish/jersey/examples/bookstore/webapp/resource/Track/index.jsp], model [org.glassfish.jersey.examples.bookstore.webapp.resource.Track @3937f594] X-Jersey-Tracing-038: MBW [ 1.09 / 24.63 ms | 4.39 %] WriteTo by [org.glassfish.jersey.server.mvc.internal.ViewableMessageBodyWriter @78b353d4] diff --git a/docs/src/main/docbook/mvc.xml b/docs/src/main/docbook/mvc.xml index 2fbe22cc4d..424d8340ad 100644 --- a/docs/src/main/docbook/mvc.xml +++ b/docs/src/main/docbook/mvc.xml @@ -420,7 +420,7 @@ public ShortenedLink createLink(@NotEmpty @FormParam("link") final String link) org.glassfish.jersey.examples.freemarker.MyApplication org.glassfish.jersey.servlet.ServletContainer - javax.ws.rs.Application + jakarta.ws.rs.Application org.glassfish.jersey.examples.freemarker.MyApplication diff --git a/docs/src/main/docbook/representations.xml b/docs/src/main/docbook/representations.xml index f8a860c66c..f5bcf235f3 100644 --- a/docs/src/main/docbook/representations.xml +++ b/docs/src/main/docbook/representations.xml @@ -50,7 +50,7 @@ java.io.Reader (inbound only) java.io.File javax.activation.DataSource - javax.ws.rs.core.StreamingOutput (outbound only) + jakarta.ws.rs.core.StreamingOutput (outbound only) XML media types (text/xml, application/xml and application/...+xml) @@ -350,15 +350,15 @@ public class EntityNotFoundMapper implements ExceptionMapper<javax.persistenc root resource class computes an entity tag from the request URI and then calls the - request.evaluatePreconditions + request.evaluatePreconditions with that entity tag. If a client request contains an If-None-Match header with a value that contains the same entity tag that was calculated then the - evaluatePreconditions + evaluatePreconditions returns a pre-filled out response, with the 304 status code and entity tag set, that may be built and returned. Otherwise, - evaluatePreconditions + evaluatePreconditions returns null and the normal response can be diff --git a/docs/src/main/docbook/resource-builder.xml b/docs/src/main/docbook/resource-builder.xml index f4d8082939..1090315c73 100644 --- a/docs/src/main/docbook/resource-builder.xml +++ b/docs/src/main/docbook/resource-builder.xml @@ -94,9 +94,9 @@ package org.glassfish.jersey.examples.helloworld; - import javax.ws.rs.container.ContainerRequestContext; - import javax.ws.rs.core.Application; - import javax.ws.rs.core.Response; + import jakarta.ws.rs.container.ContainerRequestContext; + import jakarta.ws.rs.core.Application; + import jakarta.ws.rs.core.Response; import org.glassfish.jersey.process.Inflector; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.model.Resource; @@ -161,10 +161,10 @@ If you deploy your Jersey application into a Servlet container you will need to provide a &jaxrs.core.Application; subclass that will be used for configuration. You may use a web.xml where you would define a org.glassfish.jersey.servlet.ServletContainer Servlet entry there and specify initial parameter - javax.ws.rs.Application with the class name of your JAX-RS Application that you + jakarta.ws.rs.Application with the class name of your JAX-RS Application that you wish to deploy. In the example above, this application will be MyResourceConfig class. This is the reason why MyResourceConfig extends the &lit.jersey.server.ResourceConfig; (which, if you - remember extends the javax.ws.rs.Application). + remember extends the jakarta.ws.rs.Application). The following example shows a fragment of web.xml that can be used to deploy the @@ -177,7 +177,7 @@ <servlet-name>org.glassfish.jersey.examples.helloworld.MyApplication</servlet-name> <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> <init-param> - <param-name>javax.ws.rs.Application</param-name> + <param-name>jakarta.ws.rs.Application</param-name> <param-value>org.glassfish.jersey.examples.helloworld.MyResourceConfig</param-value> </init-param> <load-on-startup>1</load-on-startup> @@ -286,15 +286,15 @@ A programmatic resource - 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.Application; - import javax.ws.rs.core.Configuration; - 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.Produces; + import jakarta.ws.rs.container.ContainerRequestContext; + import jakarta.ws.rs.core.Application; + import jakarta.ws.rs.core.Configuration; + import jakarta.ws.rs.core.MediaType; + import jakarta.ws.rs.core.Response; + import jakarta.ws.rs.ext.Provider; import org.glassfish.jersey.process.Inflector; import org.glassfish.jersey.server.model.ModelProcessor; diff --git a/docs/src/main/docbook/spring.xml b/docs/src/main/docbook/spring.xml index 0b7568ee3d..2a8a9346c9 100644 --- a/docs/src/main/docbook/spring.xml +++ b/docs/src/main/docbook/spring.xml @@ -48,8 +48,8 @@ must themselves be managed by Spring, by annotating with @Component, @Service, @Controller or @Repository: - import javax.ws.rs.GET; -import javax.ws.rs.Path; + import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.springframework.stereotype.Component; @Component diff --git a/docs/src/main/docbook/sse.xml b/docs/src/main/docbook/sse.xml index 4bf6e9a806..8d899227d9 100644 --- a/docs/src/main/docbook/sse.xml +++ b/docs/src/main/docbook/sse.xml @@ -136,7 +136,7 @@ In previous JAX-RS versions, no standard API for server-sent events was defined. The SSE support bundled with Jersey was Jersey-specific. With JAX-RS 2.1, situation changed and SSE API is well defined in the - javax.ws.rs.sse + jakarta.ws.rs.sse package. Following chapters will describe the new SSE API. For backwards compatibility reasons, the original @@ -149,7 +149,7 @@ the instances of SSE related classes are not to be obtained manually by invoking constructors, nor to be directly returned from the resource methods. Actually, the implementing classes in the jersey.media.sse.internal package should never be needed - to be imported. The only API to be used is directly in the JAX-RS package (javax.ws.rs.sse). + to be imported. The only API to be used is directly in the JAX-RS package (jakarta.ws.rs.sse). Only builders in the API along with dependency injection should be used and provides access to the entire functionality. @@ -177,9 +177,9 @@ dependencies and injects the &jaxrs21.sse.SseEventSink; (represents the output) and &jaxrs21.sse.Sse; (provides factory methods for other SSE related types, in this case it is used to retrieve the event builder). ... -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; -import javax.ws.rs.sse.OutboundSseEvent; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.sse.OutboundSseEvent; ... @Path("events") @@ -218,9 +218,9 @@ public static class SseResource { In the, the resource method creates a new thread that sends a sequence of 10 events. There is a 1 second delay between two subsequent events as indicated in a comment. Each - event is represented by javax.ws.rs.sse.OutboundSseEvent type and is built with a help of a + event is represented by jakarta.ws.rs.sse.OutboundSseEvent type and is built with a help of a provided Builder. The Builder is obtain via the injected instance - (actually, it is a singleton) of javax.ws.rs.sse.Sse (the + (actually, it is a singleton) of jakarta.ws.rs.sse.Sse (the newEventBuilder() method. The OutboundSseEvent implementation reflects the standardized format of SSE messages and contains properties that represent name (for named events), @@ -327,9 +327,9 @@ data: Hello world 9! Broadcasting SSE messages (with JAX-RS 2.1 API) ... -import javax.ws.rs.sse.Sse; -import javax.ws.rs.sse.SseEventSink; -import javax.ws.rs.sse.SseBroadcaster; +import jakarta.ws.rs.sse.Sse; +import jakarta.ws.rs.sse.SseEventSink; +import jakarta.ws.rs.sse.SseBroadcaster; ... @Singleton @@ -420,14 +420,14 @@ public static class BroadcasterResource { Consuming SSE events within Jersey clients On the client side, push programming model is used (event consumer / client) gets asynchronously notified about - incoming events by subscribing custom listener to javax.ws.rs.sse.SseEventSource. This happens by + incoming events by subscribing custom listener to jakarta.ws.rs.sse.SseEventSource. This happens by invoking one of its subscribe() methods. The usage of SseEventSource is shown in the following example. Consuming SSE events with SseEventSource - import javax.ws.rs.sse.SseEventSource; + import jakarta.ws.rs.sse.SseEventSource; ... Client client = ClientBuilder.newBuilder().build(); WebTarget target = client.target("http://example.com/events"); @@ -446,15 +446,15 @@ sseEventSource.close(); is deployed. The &jaxrs.client.Client; instance is created (and initialized with &jersey.sse.SseFeature; automatically). Then the &jaxrs.client.WebTarget; is built. In this case a request to the web target is not made directly in the code, instead, the web target instance - is used to initialize a new &javax.ws.rs.sse.SseEventSource.Builder; instance that is used to build a new - &javax.ws.rs.sse.SseEventSource;. The choice of build() method is important, as it tells + is used to initialize a new &jakarta.ws.rs.sse.SseEventSource.Builder; instance that is used to build a new + &jakarta.ws.rs.sse.SseEventSource;. The choice of build() method is important, as it tells the SseEventSource.Builder to create a new SseEventSource that is not automatically connected to the target. The connection is established only later by manually invoking the sseEventSource.open() method. A custom java.util.function.Consumer<InboundSseEvent> implementation is used to listen to and process incoming SSE events. The method readData(Class) says that the - event data should be de-serialized from a received &javax.ws.rs.sse.InboundSseEvent; instance into a + event data should be de-serialized from a received &jakarta.ws.rs.sse.InboundSseEvent; instance into a String Java type. This method call internally executes &jaxrs.ext.MessageBodyReader; which de-serializes the event data. This is similar to reading an entity from the &jaxrs.core.Response; by @@ -542,7 +542,7 @@ onComplete); This gives the subscriber a tool to manage the load and do a back-pressure by incrementaly requesting only certain amount of items. When SseEventSource registers a new subscriber, it calls its onSubscribe handler and hands over the - javax.ws.rs.sse.SseSubscription + jakarta.ws.rs.sse.SseSubscription instance. This class only has two methods - request(long) for asking for a certain amount of events (often used as @@ -579,7 +579,7 @@ onComplete); reconnect support - The &javax.ws.rs.sse.SseEventSource; implementation supports automated recuperation + The &jakarta.ws.rs.sse.SseEventSource; implementation supports automated recuperation from a connection loss, including negotiation of delivery of any missed events based on the last received SSE event id field value, provided this field is set by the server and the negotiation facility is supported by the server. In case of a connection loss, the last received SSE event @@ -599,13 +599,13 @@ onComplete); By default, when a connection the the SSE endpoint is lost, the event source will use a default delay before attempting to reconnect to the SSE endpoint. The SSE endpoint can however control the client-side retry delay by including a special retry field value in any event sent to the client. - Jersey &javax.ws.rs.sse.SseEventSource; implementation automatically tracks any received SSE event + Jersey &jakarta.ws.rs.sse.SseEventSource; implementation automatically tracks any received SSE event retry field values set by the endpoint and adjusts the reconnect delay accordingly, using the last received retry field value as the new reconnect delay. - In addition to handling the standard connection losses, Jersey &javax.ws.rs.sse.SseEventSource; automatically + In addition to handling the standard connection losses, Jersey &jakarta.ws.rs.sse.SseEventSource; automatically deals with any HTTP 503 Service Unavailable responses received from the SSE endpoint, that include a Retry-After HTTP header with a valid value. The HTTP 503 + Retry-After @@ -1071,7 +1071,7 @@ eventSource.close(); Reconnect support in Jersey-specific &lit.jersey.sse.EventSource; works the same way as in the - implementation of the JAX-RS &javax.ws.rs.sse.SseEventSource;. + implementation of the JAX-RS &jakarta.ws.rs.sse.SseEventSource;. diff --git a/etc/travis/travis.sh b/etc/travis/travis.sh index 544d2d031d..21985dc094 100644 --- a/etc/travis/travis.sh +++ b/etc/travis/travis.sh @@ -28,7 +28,7 @@ PING_LOOP_PID=$! if [ "$1" = "glassfish-copyright:copyright" ]; then mvn glassfish-copyright:copyright else - mvn -e -U -B -Peclipse_repo,staging clean install $1 >> $BUILD_OUTPUT 2>&1 + mvn -e -U -B -Peclipse_repo clean install $1 >> $BUILD_OUTPUT 2>&1 fi # The build finished without returning an error so dump a tail of the output diff --git a/examples/etc/gf-project-src-pom.xsl b/examples/etc/gf-project-src-pom.xsl index bcd0b5cecc..198c79e743 100644 --- a/examples/etc/gf-project-src-pom.xsl +++ b/examples/etc/gf-project-src-pom.xsl @@ -36,7 +36,7 @@ or pom:groupId='javax.annotation' or pom:groupId='javax.enterprise' or pom:groupId='javax.servlet' - or pom:groupId='javax.ws.rs']/pom:scope[text()!=test]"> + or pom:groupId='jakarta.ws.rs']/pom:scope[text()!=test]"> provided @@ -54,7 +54,7 @@ or pom:groupId='javax.annotation' or pom:groupId='javax.enterprise' or pom:groupId='javax.servlet' - or pom:groupId='javax.ws.rs']"> + or pom:groupId='jakarta.ws.rs']"> diff --git a/examples/helloworld-spring-webapp/README.MD b/examples/helloworld-spring-webapp/README.MD index a5f07f795f..f175bc0c3e 100644 --- a/examples/helloworld-spring-webapp/README.MD +++ b/examples/helloworld-spring-webapp/README.MD @@ -24,7 +24,7 @@ URI path | Resource class | HTTP methods **_/spring-singleton-hello_** | SpringSingletonResource | GET Application is configured by using web.xml, which registers -[javax.ws.rs.core.Application](https://jax-rs-spec.java.net/nonav/2.0/apidocs/javax/ws/rs/core/Application.html) +[jakarta.ws.rs.core.Application](https://jax-rs-spec.java.net/nonav/2.0/apidocs/jakarta.ws.rs/core/Application.html) descendant to get classes and singletons from it (see class MyApplication). diff --git a/examples/helloworld-webapp/README.MD b/examples/helloworld-webapp/README.MD index e449fce291..7b2cd5a60f 100644 --- a/examples/helloworld-webapp/README.MD +++ b/examples/helloworld-webapp/README.MD @@ -23,7 +23,7 @@ URI path | Resource class | HTTP methods **_/helloworld_** | HelloWorldResource | GET Application is configured by using web.xml, which registers -[javax.ws.rs.core.Application](https://jax-rs-spec.java.net/nonav/2.0/apidocs/javax/ws/rs/core/Application.html) +[jakarta.ws.rs.core.Application](https://jax-rs-spec.java.net/nonav/2.0/apidocs/jakarta.ws.rs/core/Application.html) descendant to get classes and singletons from it (see class MyApplication). Running the Example diff --git a/examples/managed-client-webapp/README.MD b/examples/managed-client-webapp/README.MD index 4937d1b581..895572b048 100644 --- a/examples/managed-client-webapp/README.MD +++ b/examples/managed-client-webapp/README.MD @@ -27,7 +27,7 @@ URI path | Resource class | HTTP methods In the example, the requests to a *public resource* deployed on `/public/` path are forwarded to an *internal resource* (deployed on `/internal/` path) using injected -[javax.ws.rs.client.WebTarget](https://jax-rs-spec.java.net/nonav/2.0/apidocs/javax/ws/rs/client/WebTarget.html) +[jakarta.ws.rs.client.WebTarget](https://jax-rs-spec.java.net/nonav/2.0/apidocs/jakarta.ws.rs/client/WebTarget.html) instances produced using 2 separate managed clients each of the managed clients using it's own custom configuration. diff --git a/examples/managed-client/README.MD b/examples/managed-client/README.MD index 249eeb9135..8fe0ab3c6a 100644 --- a/examples/managed-client/README.MD +++ b/examples/managed-client/README.MD @@ -27,7 +27,7 @@ URI path | Resource class | HTTP methods In the example, the requests to a *public resource* deployed on `/public/` path are forwarded to an *internal resource* (deployed on `/internal/` path) using injected -[javax.ws.rs.client.WebTarget](https://jax-rs-spec.java.net/nonav/2.0/apidocs/javax/ws/rs/client/WebTarget.html) +[jakarta.ws.rs.client.WebTarget](https://jax-rs-spec.java.net/nonav/2.0/apidocs/jakarta.ws.rs/client/WebTarget.html) instances produced using 2 separate managed clients each of the managed clients using it's own custom configuration. diff --git a/pom.xml b/pom.xml index 43d6799dfc..74e3ab4232 100644 --- a/pom.xml +++ b/pom.xml @@ -2107,7 +2107,7 @@ 2.2.3 2.0.2 3.0.0-RC2 - 3.0.0-M1 + 2.3.2 1.0.2 3.0 3.0.0-M1 diff --git a/tests/integration/servlet-3-async/pom.xml b/tests/integration/servlet-3-async/pom.xml index 670646360d..29066539fd 100644 --- a/tests/integration/servlet-3-async/pom.xml +++ b/tests/integration/servlet-3-async/pom.xml @@ -30,7 +30,7 @@ war jersey-tests-integration-servlet-3-async - Servlet integration test - servlet-3-async - configured via jax-rs application annotated with @javax.ws.rs.ApplicationPath + Servlet integration test - servlet-3-async - configured via jax-rs application annotated with @jakarta.ws.rs.ApplicationPath diff --git a/tests/integration/servlet-3-gf-async/pom.xml b/tests/integration/servlet-3-gf-async/pom.xml index 75bce0f4a3..05c66b8ede 100644 --- a/tests/integration/servlet-3-gf-async/pom.xml +++ b/tests/integration/servlet-3-gf-async/pom.xml @@ -30,7 +30,7 @@ war jersey-tests-integration-servlet-3-gf-async - Servlet (GF) integration test - servlet-3-gf-async - configured via jax-rs application annotated with @javax.ws.rs.ApplicationPath + Servlet (GF) integration test - servlet-3-gf-async - configured via jax-rs application annotated with @jakarta.ws.rs.ApplicationPath diff --git a/tests/integration/servlet-3-init-1/pom.xml b/tests/integration/servlet-3-init-1/pom.xml index d3a2af94f9..b5e13d8b04 100644 --- a/tests/integration/servlet-3-init-1/pom.xml +++ b/tests/integration/servlet-3-init-1/pom.xml @@ -30,7 +30,7 @@ war jersey-tests-integration-servlet-3-init-1 - Servlet integration test - servlet-3-init-1 - configured via jax-rs application annotated with @javax.ws.rs.ApplicationPath + Servlet integration test - servlet-3-init-1 - configured via jax-rs application annotated with @jakarta.ws.rs.ApplicationPath diff --git a/tests/integration/servlet-3-init-2/pom.xml b/tests/integration/servlet-3-init-2/pom.xml index aa82ecc48d..f6dc66d6b8 100644 --- a/tests/integration/servlet-3-init-2/pom.xml +++ b/tests/integration/servlet-3-init-2/pom.xml @@ -31,8 +31,8 @@ jersey-tests-integration-servlet-3-init-2 - Servlet integration test - servlet-3-init-2 - configured via jax-rs application annotated with @javax.ws.rs.ApplicationPath - and providers annotated with @javax.ws.rs.ext.Provider. + Servlet integration test - servlet-3-init-2 - configured via jax-rs application annotated with @jakarta.ws.rs.ApplicationPath + and providers annotated with @jakarta.ws.rs.ext.Provider. diff --git a/tests/integration/servlet-3-init-5/pom.xml b/tests/integration/servlet-3-init-5/pom.xml index beb5f31b12..b618d95266 100644 --- a/tests/integration/servlet-3-init-5/pom.xml +++ b/tests/integration/servlet-3-init-5/pom.xml @@ -31,7 +31,7 @@ jersey-tests-integration-servlet-3-init-5 Servlet integration test - servlet-3-init-5 - no Application subclass is present; - dynamically add a servlet and set its name to javax.ws.rs.core.Application + dynamically add a servlet and set its name to jakarta.ws.rs.core.Application diff --git a/tests/integration/servlet-3-init-7/pom.xml b/tests/integration/servlet-3-init-7/pom.xml index 0b5c8ff362..d50c0fc431 100644 --- a/tests/integration/servlet-3-init-7/pom.xml +++ b/tests/integration/servlet-3-init-7/pom.xml @@ -31,7 +31,7 @@ jersey-tests-integration-servlet-3-init-7 Servlet integration test - servlet-3-init-7 - no Application subclass is present; - dynamically add a servlet and set its name to javax.ws.rs.core.Application; + dynamically add a servlet and set its name to jakarta.ws.rs.core.Application; servlet-mapping in web.xml diff --git a/tests/integration/servlet-3-init-8/pom.xml b/tests/integration/servlet-3-init-8/pom.xml index 586856e9c6..89785faf86 100644 --- a/tests/integration/servlet-3-init-8/pom.xml +++ b/tests/integration/servlet-3-init-8/pom.xml @@ -31,7 +31,7 @@ jersey-tests-integration-servlet-3-init-8 Servlet integration test - servlet-3-init-8 - more jax-rs applications - (annotated with @javax.ws.rs.ApplicationPath and/or configured in web.xml). + (annotated with @jakarta.ws.rs.ApplicationPath and/or configured in web.xml). diff --git a/tests/mem-leaks/test-cases/bean-param-leak/src/main/webapp/WEB-INF/weblogic.xml b/tests/mem-leaks/test-cases/bean-param-leak/src/main/webapp/WEB-INF/weblogic.xml index 473e71de8b..edd28aa97e 100644 --- a/tests/mem-leaks/test-cases/bean-param-leak/src/main/webapp/WEB-INF/weblogic.xml +++ b/tests/mem-leaks/test-cases/bean-param-leak/src/main/webapp/WEB-INF/weblogic.xml @@ -24,7 +24,7 @@ - javax.ws.rs.* + jakarta.ws.rs.* javassist.* @@ -43,7 +43,7 @@ META-INF/services/javax.servlet.ServletContainerInitializer - META-INF/services/javax.ws.rs.ext.RuntimeDelegate + META-INF/services/jakarta.ws.rs.ext.RuntimeDelegate META-INF/services/org.glassfish.jersey.* From ac41f98ee588a4cfd818a0d192c31fca955c402c Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Mon, 6 Apr 2020 12:30:12 +0200 Subject: [PATCH 5/5] jakartification: jakarta.xml.bind Signed-off-by: Maxim Nesen --- .../jersey/jetty/connector/EntityTest.java | 2 +- .../jersey/message/MessageProperties.java | 2 +- core-server/pom.xml | 5 +++ .../com/sun/research/ws/wadl/Application.java | 14 +++--- .../java/com/sun/research/ws/wadl/Doc.java | 22 +++++----- .../com/sun/research/ws/wadl/Grammars.java | 10 ++--- .../com/sun/research/ws/wadl/HTTPMethods.java | 4 +- .../com/sun/research/ws/wadl/Include.java | 14 +++--- .../java/com/sun/research/ws/wadl/Link.java | 20 ++++----- .../java/com/sun/research/ws/wadl/Method.java | 22 +++++----- .../sun/research/ws/wadl/ObjectFactory.java | 2 +- .../java/com/sun/research/ws/wadl/Option.java | 14 +++--- .../java/com/sun/research/ws/wadl/Param.java | 22 +++++----- .../com/sun/research/ws/wadl/ParamStyle.java | 6 +-- .../sun/research/ws/wadl/Representation.java | 22 +++++----- .../com/sun/research/ws/wadl/Request.java | 12 ++--- .../com/sun/research/ws/wadl/Resource.java | 26 +++++------ .../sun/research/ws/wadl/ResourceType.java | 26 +++++------ .../com/sun/research/ws/wadl/Resources.java | 18 ++++---- .../com/sun/research/ws/wadl/Response.java | 14 +++--- .../sun/research/ws/wadl/package-info.java | 2 +- .../server/wadl/WadlApplicationContext.java | 2 +- .../jersey/server/wadl/WadlGenerator.java | 4 +- .../internal/WadlApplicationContextImpl.java | 6 +-- .../server/wadl/internal/WadlResource.java | 2 +- .../server/wadl/internal/WadlUtils.java | 6 +-- .../internal/generators/ApplicationDocs.java | 10 ++--- .../internal/generators/ObjectFactory.java | 2 +- .../WadlGeneratorJAXBGrammarGenerator.java | 12 ++--- .../resourcedoc/model/AnnotationDocType.java | 8 ++-- .../resourcedoc/model/ClassDocType.java | 10 ++--- .../resourcedoc/model/MethodDocType.java | 12 ++--- .../resourcedoc/model/NamedValueType.java | 6 +-- .../resourcedoc/model/ObjectFactory.java | 2 +- .../resourcedoc/model/ParamDocType.java | 10 ++--- .../model/RepresentationDocType.java | 8 ++-- .../resourcedoc/model/RequestDocType.java | 6 +-- .../resourcedoc/model/ResourceDocType.java | 10 ++--- .../resourcedoc/model/ResponseDocType.java | 8 ++-- .../resourcedoc/model/WadlParamType.java | 8 ++-- .../resourcedoc/xhtml/Elements.java | 2 +- .../resourcedoc/xhtml/ObjectFactory.java | 2 +- .../resourcedoc/xhtml/XhtmlElementType.java | 10 ++--- .../resourcedoc/xhtml/XhtmlValueType.java | 10 ++--- .../wadl/processor/WadlModelProcessor.java | 2 +- .../server/internal/inject/FormParamTest.java | 2 +- .../WadlGeneratorResourceDocSupportTest.java | 6 +-- docs/src/main/docbook/jersey.ent | 4 +- docs/src/main/docbook/media.xml | 2 +- docs/src/main/docbook/representations.xml | 6 +-- .../bookstore/webapp/resource/Book.java | 6 +-- .../bookstore/webapp/resource/Bookstore.java | 6 +-- .../bookstore/webapp/resource/CD.java | 6 +-- .../bookstore/webapp/resource/Item.java | 6 +-- .../bookstore/webapp/resource/Track.java | 6 +-- .../representation/ItemRepresentation.java | 14 +++--- .../representation/ItemsRepresentation.java | 14 +++--- .../security/domain/RestrictedEntity.java | 2 +- .../security/domain/RestrictedSubEntity.java | 2 +- .../selectable/domain/Address.java | 2 +- .../selectable/domain/Person.java | 2 +- .../selectable/domain/PhoneNumber.java | 2 +- .../entityfiltering/domain/Project.java | 2 +- .../examples/entityfiltering/domain/Task.java | 2 +- .../examples/entityfiltering/domain/User.java | 2 +- .../RootResource.java | 2 +- .../SecurityFilter.java | 2 +- .../jersey/examples/jaxb/JaxbResource.java | 2 +- .../examples/jaxb/JaxbXmlRootElement.java | 2 +- .../jersey/examples/jaxb/JaxbXmlType.java | 2 +- .../jersey/examples/jaxb/JaxbTest.java | 2 +- .../jackson/CombinedAnnotationBean.java | 2 +- .../examples/jackson/EmptyArrayBean.java | 2 +- .../examples/jettison/AircraftType.java | 2 +- .../jersey/examples/jettison/FlightType.java | 8 ++-- .../jersey/examples/jettison/Flights.java | 10 ++--- .../jettison/JaxbContextResolver.java | 2 +- .../examples/jettison/ObjectFactory.java | 2 +- .../jersey/examples/jsonmoxy/TestBean.java | 2 +- .../examples/jsonp/ChangeRecordBean.java | 4 +- .../examples/multipart/webapp/Bean.java | 2 +- .../examples/oauth/twitterclient/Status.java | 4 +- .../examples/oauth/twitterclient/User.java | 4 +- examples/pom.xml | 8 +++- .../examples/rx/domain/Calculation.java | 2 +- .../jersey/examples/rx/domain/Forecast.java | 2 +- .../server/async/managed/Message.java | 2 +- .../jersey/examples/aggregator/Message.java | 2 +- examples/xml-moxy/README.MD | 2 +- .../examples/xmlmoxy/beans/Customer.java | 4 +- .../examples/xmlmoxy/beans/PhoneNumber.java | 4 +- .../server/validation/ValidationError.java | 2 +- .../filtering/spi/FilteringHelper.java | 2 +- .../glassfish/jersey/client/proxy/MyBean.java | 2 +- .../jersey/wadl/doclet/DocletUtils.java | 4 +- .../jersey/wadl/doclet/ResourceDoclet.java | 2 - .../jersey/linking/FieldProcessor.java | 2 +- .../jersey/linking/FieldProcessorTest.java | 2 +- media/jaxb/pom.xml | 2 +- .../AbstractCollectionJaxbProvider.java | 20 ++++----- .../internal/AbstractJaxbElementProvider.java | 10 ++--- .../jaxb/internal/AbstractJaxbProvider.java | 10 ++--- .../AbstractRootElementJaxbProvider.java | 16 +++---- .../internal/JaxbStringReaderProvider.java | 12 ++--- .../internal/XmlCollectionJaxbProvider.java | 8 ++-- .../jaxb/internal/XmlJaxbElementProvider.java | 8 ++-- .../internal/XmlRootElementJaxbProvider.java | 8 ++-- .../internal/XmlRootObjectJaxbProvider.java | 8 ++-- .../JaxbStringReaderProviderTest.java | 2 +- .../jersey/jettison/JettisonJaxbContext.java | 44 +++++++++---------- .../jersey/jettison/JettisonMarshaller.java | 18 ++++---- .../jersey/jettison/JettisonUnmarshaller.java | 40 ++++++++--------- .../jettison/internal/BaseJsonMarshaller.java | 8 ++-- .../internal/BaseJsonUnmarshaller.java | 12 ++--- .../internal/JettisonJaxbMarshaller.java | 14 +++--- .../internal/JettisonJaxbUnmarshaller.java | 18 ++++---- .../entity/JettisonJaxbElementProvider.java | 10 ++--- .../entity/JettisonListElementProvider.java | 6 +-- .../entity/JettisonRootElementProvider.java | 10 ++--- .../moxy/internal/MoxyObjectProvider.java | 2 +- .../jersey/moxy/json/MoxyJsonConfig.java | 6 +-- .../ConfigurableMoxyJsonProvider.java | 8 ++-- .../internal/FilteringMoxyJsonProvider.java | 6 +-- .../jersey/moxy/xml/MoxyContextResolver.java | 4 +- .../tests/e2e/client/BasicClientTest.java | 2 +- .../jersey/tests/e2e/entity/CharsetTest.java | 2 +- .../tests/e2e/entity/EmptyEntityTest.java | 4 +- .../e2e/entity/EmptyRequestWithJaxbTest.java | 4 +- .../tests/e2e/entity/EntityTypesTest.java | 6 +-- .../e2e/entity/JAXBContextResolverTest.java | 10 ++--- .../jersey/tests/e2e/entity/JaxbBean.java | 2 +- .../jersey/tests/e2e/entity/JaxbBeanType.java | 2 +- .../jersey/tests/e2e/entity/JsonMoxyTest.java | 2 +- .../jersey/tests/e2e/entity/XXETest.java | 2 +- .../entity/XmlJaxBElementProviderTest.java | 2 +- .../jersey/tests/e2e/entity/XmlMoxyTest.java | 8 ++-- .../filtering/domain/ComplexEntity.java | 8 ++-- .../filtering/domain/ComplexSubEntity.java | 8 ++-- .../filtering/domain/ComplexSubSubEntity.java | 8 ++-- .../domain/DefaultFilteringSubEntity.java | 6 +-- .../filtering/domain/FilteredClassEntity.java | 6 +-- .../domain/ManyFilteringsOnClassEntity.java | 8 ++-- .../ManyFilteringsOnPropertiesEntity.java | 8 ++-- .../domain/ManyFilteringsSubEntity.java | 6 +-- .../domain/OneFilteringOnClassEntity.java | 8 ++-- .../OneFilteringOnPropertiesEntity.java | 8 ++-- .../domain/OneFilteringSubEntity.java | 6 +-- .../json/MoxyEntityFilteringTest.java | 6 +-- .../tests/e2e/json/AbstractJsonTest.java | 4 +- .../tests/e2e/json/JsonWithPaddingTest.java | 2 +- .../jersey/tests/e2e/json/entity/Animal.java | 2 +- .../tests/e2e/json/entity/AnimalList.java | 2 +- .../tests/e2e/json/entity/AnotherAnimal.java | 2 +- .../e2e/json/entity/AnotherArrayTestBean.java | 6 +-- .../tests/e2e/json/entity/AnotherCat.java | 2 +- .../e2e/json/entity/AttrAndCharDataBean.java | 6 +-- .../jersey/tests/e2e/json/entity/Cat.java | 2 +- .../tests/e2e/json/entity/ColorHolder.java | 2 +- .../entity/ComplexBeanWithAttributes.java | 6 +-- .../entity/ComplexBeanWithAttributes2.java | 6 +-- .../entity/ComplexBeanWithAttributes3.java | 4 +- .../entity/ComplexBeanWithAttributes4.java | 6 +-- .../jersey/tests/e2e/json/entity/Dog.java | 2 +- .../e2e/json/entity/EmptyElementBean.java | 2 +- .../entity/EmptyElementContainingBean.java | 2 +- .../e2e/json/entity/EncodedContentBean.java | 2 +- .../tests/e2e/json/entity/FakeArrayBean.java | 10 ++--- .../tests/e2e/json/entity/IntArray.java | 2 +- .../tests/e2e/json/entity/Jersey1199List.java | 2 +- .../e2e/json/entity/ListAndNonListBean.java | 2 +- .../tests/e2e/json/entity/ListEmptyBean.java | 2 +- .../e2e/json/entity/ListWrapperBean.java | 2 +- .../jersey/tests/e2e/json/entity/MyError.java | 10 ++--- .../tests/e2e/json/entity/MyMessage.java | 10 ++--- .../tests/e2e/json/entity/MyResponse.java | 10 ++--- .../tests/e2e/json/entity/NamespaceBean.java | 4 +- .../entity/NamespaceBeanWithAttribute.java | 6 +-- .../tests/e2e/json/entity/NullStringBean.java | 4 +- .../jersey/tests/e2e/json/entity/Person.java | 12 ++--- .../e2e/json/entity/PureCharDataBean.java | 4 +- .../e2e/json/entity/RegisterMessage.java | 4 +- .../tests/e2e/json/entity/SimpleBean.java | 4 +- .../json/entity/SimpleBeanWithAttributes.java | 4 +- .../SimpleBeanWithJustOneAttribute.java | 4 +- ...impleBeanWithJustOneAttributeAndValue.java | 6 +-- .../SimpleBeanWithObjectAttributes.java | 4 +- .../e2e/json/entity/SimpleXmlTypeBean.java | 4 +- .../entity/SingleItemListWrapperBean.java | 2 +- .../tests/e2e/json/entity/TreeModel.java | 4 +- .../e2e/json/entity/TwoListsWrapperBean.java | 2 +- .../jersey/tests/e2e/json/entity/User.java | 6 +-- .../tests/e2e/json/entity/UserTable.java | 8 ++-- .../e2e/server/ContentNegotiationTest.java | 2 +- .../tests/e2e/server/EntityExpansionTest.java | 10 ++--- .../tests/e2e/server/ResourceConfigTest.java | 2 +- .../mvc/TemplateMethodSelectionTest.java | 2 +- .../e2e/server/validation/CustomBean.java | 4 +- .../AnotherContactBean.java | 2 +- .../e2e/server/wadl/WadlResourceTest.java | 2 +- .../jersey/tests/e2e/common/NoEntityTest.java | 4 +- .../jersey/tests/e2e/oauth/OAuth2Test.java | 4 +- .../integration/jersey2892/TestResource.java | 2 +- .../servlet_25_mvc_1/resource/Book.java | 6 +-- .../servlet_25_mvc_1/resource/Bookstore.java | 6 +-- .../servlet_25_mvc_1/resource/Item.java | 6 +-- .../servlet_25_mvc_2/resource/Book.java | 6 +-- .../servlet_25_mvc_2/resource/Bookstore.java | 6 +-- .../servlet_25_mvc_2/resource/Item.java | 6 +-- .../servlet_25_mvc_3/resource/Book.java | 6 +-- .../servlet_25_mvc_3/resource/Bookstore.java | 6 +-- .../servlet_25_mvc_3/resource/Item.java | 6 +-- .../servlet_3_chunked_io/Message.java | 6 +-- .../osgi/test/basic/JsonJettisonTest.java | 4 +- .../jersey/osgi/test/basic/JsonMoxyTest.java | 4 +- .../jersey/osgi/test/basic/JsonResource.java | 2 +- .../test/basic/WebResourceFactoryTest.java | 6 +-- .../benchmark/entity/json/Project.java | 2 +- .../benchmark/entity/json/Task.java | 2 +- .../benchmark/entity/json/User.java | 2 +- .../tests/performance/mbw/xml/Person.java | 2 +- .../tests/performance/mbw/xml/Person.java | 2 +- .../tests/performance/tools/Person.java | 2 +- .../tests/performance/tools/TestBean.java | 6 +-- 223 files changed, 700 insertions(+), 691 deletions(-) diff --git a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java index 7700843414..140ab60e59 100644 --- a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java +++ b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.logging.LoggingFeature; diff --git a/core-common/src/main/java/org/glassfish/jersey/message/MessageProperties.java b/core-common/src/main/java/org/glassfish/jersey/message/MessageProperties.java index 740223d1ec..019ef6cf3c 100644 --- a/core-common/src/main/java/org/glassfish/jersey/message/MessageProperties.java +++ b/core-common/src/main/java/org/glassfish/jersey/message/MessageProperties.java @@ -28,7 +28,7 @@ public final class MessageProperties { /** * If set to {@code true} then XML root element tag name for collections will - * be derived from {@link javax.xml.bind.annotation.XmlRootElement @XmlRootElement} + * be derived from {@link jakarta.xml.bind.annotation.XmlRootElement @XmlRootElement} * annotation value and won't be de-capitalized. *

* The default value is {@code false}. diff --git a/core-server/pom.xml b/core-server/pom.xml index e0dd8cb42a..1543a1a73c 100644 --- a/core-server/pom.xml +++ b/core-server/pom.xml @@ -193,6 +193,11 @@ jakarta.validation-api + + jakarta.xml.bind + jakarta.xml.bind-api + + org.osgi org.osgi.core diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Application.java b/core-server/src/main/java/com/sun/research/ws/wadl/Application.java index e9506150c8..d14728fd88 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Application.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Application.java @@ -10,13 +10,13 @@ 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.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -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.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Doc.java b/core-server/src/main/java/com/sun/research/ws/wadl/Doc.java index ba8d04b717..f7ba006b97 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Doc.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Doc.java @@ -12,17 +12,17 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlMixed; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Grammars.java b/core-server/src/main/java/com/sun/research/ws/wadl/Grammars.java index 4ca29c0a20..78342a5efa 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Grammars.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Grammars.java @@ -10,11 +10,11 @@ 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.XmlAnyElement; -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.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/HTTPMethods.java b/core-server/src/main/java/com/sun/research/ws/wadl/HTTPMethods.java index 4a06ac43a8..63195cc42e 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/HTTPMethods.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/HTTPMethods.java @@ -7,8 +7,8 @@ package com.sun.research.ws.wadl; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** *

Java class for HTTPMethods. diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Include.java b/core-server/src/main/java/com/sun/research/ws/wadl/Include.java index 960c55b92d..9d9e807d68 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Include.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Include.java @@ -12,13 +12,13 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; /** diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Link.java b/core-server/src/main/java/com/sun/research/ws/wadl/Link.java index 6c7048436b..1f7d18a7e4 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Link.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Link.java @@ -12,16 +12,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Method.java b/core-server/src/main/java/com/sun/research/ws/wadl/Method.java index 64a06de3cc..ede15e36a6 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Method.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Method.java @@ -12,17 +12,17 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/ObjectFactory.java b/core-server/src/main/java/com/sun/research/ws/wadl/ObjectFactory.java index 3bacfbb4f1..3ac8cec094 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/ObjectFactory.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/ObjectFactory.java @@ -7,7 +7,7 @@ package com.sun.research.ws.wadl; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Option.java b/core-server/src/main/java/com/sun/research/ws/wadl/Option.java index 07b98825d7..299074b15c 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Option.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Option.java @@ -12,13 +12,13 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -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.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Param.java b/core-server/src/main/java/com/sun/research/ws/wadl/Param.java index 90713154b0..5f3bf6a8ad 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Param.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Param.java @@ -12,17 +12,17 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/ParamStyle.java b/core-server/src/main/java/com/sun/research/ws/wadl/ParamStyle.java index ed8e07a78c..954c01d1d7 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/ParamStyle.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/ParamStyle.java @@ -8,9 +8,9 @@ package com.sun.research.ws.wadl; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Representation.java b/core-server/src/main/java/com/sun/research/ws/wadl/Representation.java index b30d44dbab..c483673134 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Representation.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Representation.java @@ -12,17 +12,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Request.java b/core-server/src/main/java/com/sun/research/ws/wadl/Request.java index c2279a6795..0da963b665 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Request.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Request.java @@ -12,12 +12,12 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -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.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Resource.java b/core-server/src/main/java/com/sun/research/ws/wadl/Resource.java index a89e0ac10e..28686e6db5 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Resource.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Resource.java @@ -12,19 +12,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/ResourceType.java b/core-server/src/main/java/com/sun/research/ws/wadl/ResourceType.java index 4dd0e998e9..406d196a1d 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/ResourceType.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/ResourceType.java @@ -12,19 +12,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Resources.java b/core-server/src/main/java/com/sun/research/ws/wadl/Resources.java index 2b2579d943..af8f88c6f0 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Resources.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Resources.java @@ -12,15 +12,15 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +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 javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/Response.java b/core-server/src/main/java/com/sun/research/ws/wadl/Response.java index 6a50d75874..17b8d1bf22 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/Response.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/Response.java @@ -12,13 +12,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -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.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/core-server/src/main/java/com/sun/research/ws/wadl/package-info.java b/core-server/src/main/java/com/sun/research/ws/wadl/package-info.java index ef32f1f637..eae8a9e5eb 100644 --- a/core-server/src/main/java/com/sun/research/ws/wadl/package-info.java +++ b/core-server/src/main/java/com/sun/research/ws/wadl/package-info.java @@ -5,5 +5,5 @@ // Generated on: 2014.08.06 at 11:57:31 AM CEST // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://wadl.dev.java.net/2009/02", elementFormDefault = javax.xml.bind +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://wadl.dev.java.net/2009/02", elementFormDefault = jakarta.xml.bind .annotation.XmlNsForm.QUALIFIED) package com.sun.research.ws.wadl; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlApplicationContext.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlApplicationContext.java index a17b486b99..11f1f96612 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlApplicationContext.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlApplicationContext.java @@ -18,7 +18,7 @@ import jakarta.ws.rs.core.UriInfo; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.glassfish.jersey.server.wadl.internal.ApplicationDescription; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlGenerator.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlGenerator.java index 00e5850ae7..fdd5354405 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlGenerator.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/WadlGenerator.java @@ -23,8 +23,8 @@ import jakarta.ws.rs.core.MediaType; -import javax.xml.bind.JAXBException; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; import org.glassfish.jersey.server.model.Parameter; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlApplicationContextImpl.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlApplicationContextImpl.java index 5573cfb9c5..de6271c447 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlApplicationContextImpl.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlApplicationContextImpl.java @@ -27,9 +27,9 @@ import jakarta.ws.rs.core.UriInfo; import javax.inject.Inject; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import org.glassfish.jersey.internal.inject.InjectionManager; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlResource.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlResource.java index d55c7394e4..0c67c177b1 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlResource.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlResource.java @@ -32,7 +32,7 @@ import jakarta.ws.rs.core.UriInfo; import javax.inject.Singleton; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Marshaller; import org.glassfish.jersey.server.internal.LocalizationMessages; import org.glassfish.jersey.server.model.ExtendedResource; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlUtils.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlUtils.java index abb572dcca..670d22ea57 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlUtils.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/WadlUtils.java @@ -23,9 +23,9 @@ import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.core.UriInfo; -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 javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ApplicationDocs.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ApplicationDocs.java index 8d4dbc9867..abf959b1e8 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ApplicationDocs.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ApplicationDocs.java @@ -19,11 +19,11 @@ 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.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; import com.sun.research.ws.wadl.Doc; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ObjectFactory.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ObjectFactory.java index e0dc89db44..eeb9d9880a 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ObjectFactory.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/ObjectFactory.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.server.wadl.internal.generators; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * The object factory for application docs jaxb bindings.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/WadlGeneratorJAXBGrammarGenerator.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/WadlGeneratorJAXBGrammarGenerator.java index 8601dcab58..57468ebe34 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/WadlGeneratorJAXBGrammarGenerator.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/WadlGeneratorJAXBGrammarGenerator.java @@ -38,12 +38,12 @@ import jakarta.ws.rs.core.GenericType; import jakarta.ws.rs.core.MediaType; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.JAXBIntrospector; -import javax.xml.bind.SchemaOutputResolver; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBIntrospector; +import jakarta.xml.bind.SchemaOutputResolver; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; import javax.xml.namespace.QName; import javax.xml.transform.Result; import javax.xml.transform.stream.StreamResult; diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/AnnotationDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/AnnotationDocType.java index c12fd27936..f28f6990fe 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/AnnotationDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/AnnotationDocType.java @@ -19,10 +19,10 @@ 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.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for annotations.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ClassDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ClassDocType.java index 90ac6e2c69..8d8b9418eb 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ClassDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ClassDocType.java @@ -19,11 +19,11 @@ 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.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for classes.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/MethodDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/MethodDocType.java index 316dd44ebb..235ca01c25 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/MethodDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/MethodDocType.java @@ -19,12 +19,12 @@ 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.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for methods.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/NamedValueType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/NamedValueType.java index f00b1cceb8..8eb464d2ae 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/NamedValueType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/NamedValueType.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for named values.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ObjectFactory.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ObjectFactory.java index 5acb128c20..b669c9cfda 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ObjectFactory.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ObjectFactory.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * The object factory for xhtml supporting jaxb bindings.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ParamDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ParamDocType.java index 298d25a790..f1cacef318 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ParamDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ParamDocType.java @@ -19,11 +19,11 @@ 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.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for params: method params, path params on a class etc.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RepresentationDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RepresentationDocType.java index 381181c0d0..985549ccd7 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RepresentationDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RepresentationDocType.java @@ -16,10 +16,10 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; /** diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RequestDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RequestDocType.java index c27a5e258b..69d69ba0dc 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RequestDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/RequestDocType.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for requests.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResourceDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResourceDocType.java index 8223b5da24..33f8db1167 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResourceDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResourceDocType.java @@ -19,11 +19,11 @@ 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.XmlElementWrapper; -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.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for resources.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResponseDocType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResponseDocType.java index 0ce3fa9206..bc647eb631 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResponseDocType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/ResponseDocType.java @@ -19,10 +19,10 @@ 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.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlType; /** * The documentation type for a response.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/WadlParamType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/WadlParamType.java index 724e5312b0..0175e673bc 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/WadlParamType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/model/WadlParamType.java @@ -16,10 +16,10 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; /** diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/Elements.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/Elements.java index 9a4284a883..4ea0138677 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/Elements.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/Elements.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.xhtml; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; /** diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/ObjectFactory.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/ObjectFactory.java index c654dc1337..901c9073fb 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/ObjectFactory.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/ObjectFactory.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.xhtml; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * The object factory for xhtml supporting jaxb bindings.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlElementType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlElementType.java index 5c63c48846..4bf436a7e3 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlElementType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlElementType.java @@ -19,11 +19,11 @@ 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.XmlAnyElement; -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.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * The type for an element holding child nodes.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlValueType.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlValueType.java index d0b7481dd3..0cb8707fef 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlValueType.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/internal/generators/resourcedoc/xhtml/XhtmlValueType.java @@ -16,11 +16,11 @@ package org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.xhtml; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * The type for an element holding a string value.
diff --git a/core-server/src/main/java/org/glassfish/jersey/server/wadl/processor/WadlModelProcessor.java b/core-server/src/main/java/org/glassfish/jersey/server/wadl/processor/WadlModelProcessor.java index f8d3b72e48..b054a0c436 100644 --- a/core-server/src/main/java/org/glassfish/jersey/server/wadl/processor/WadlModelProcessor.java +++ b/core-server/src/main/java/org/glassfish/jersey/server/wadl/processor/WadlModelProcessor.java @@ -34,7 +34,7 @@ import javax.annotation.Priority; import javax.inject.Inject; import javax.inject.Provider; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Marshaller; import org.glassfish.jersey.internal.util.PropertiesHelper; import org.glassfish.jersey.message.internal.MediaTypes; diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/FormParamTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/FormParamTest.java index dc0b0a86a0..39aa5709ec 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/FormParamTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/inject/FormParamTest.java @@ -34,7 +34,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.UriInfo; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.server.ContainerResponse; import org.glassfish.jersey.server.RequestContextBuilder; diff --git a/core-server/src/test/java/org/glassfish/jersey/server/wadl/generators/resourcedoc/WadlGeneratorResourceDocSupportTest.java b/core-server/src/test/java/org/glassfish/jersey/server/wadl/generators/resourcedoc/WadlGeneratorResourceDocSupportTest.java index 2a4070d1e0..ebde23472d 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/wadl/generators/resourcedoc/WadlGeneratorResourceDocSupportTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/wadl/generators/resourcedoc/WadlGeneratorResourceDocSupportTest.java @@ -25,9 +25,9 @@ import jakarta.ws.rs.POST; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.glassfish.jersey.server.model.Resource; import org.glassfish.jersey.server.wadl.WadlGenerator; diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent index e9fd30f828..ef93eb2ca6 100644 --- a/docs/src/main/docbook/jersey.ent +++ b/docs/src/main/docbook/jersey.ent @@ -52,7 +52,7 @@ HK2"> The Spring/HK2 Bridge"> - + @@ -251,7 +251,7 @@ HttpServer"> HttpURLConnection"> InputStream"> -JAXBElement"> +JAXBElement"> KeyStore"> NIO"> Number"> diff --git a/docs/src/main/docbook/media.xml b/docs/src/main/docbook/media.xml index f984b927ad..a9b430773a 100644 --- a/docs/src/main/docbook/media.xml +++ b/docs/src/main/docbook/media.xml @@ -371,7 +371,7 @@ final ContextResolver<MoxyJsonConfig> jsonConfigResolver = moxyJsonConfig. - javax.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT + jakarta.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT false diff --git a/docs/src/main/docbook/representations.xml b/docs/src/main/docbook/representations.xml index f5bcf235f3..55c99f981b 100644 --- a/docs/src/main/docbook/representations.xml +++ b/docs/src/main/docbook/representations.xml @@ -56,10 +56,10 @@ XML media types (text/xml, application/xml and application/...+xml) javax.xml.transform.Source - javax.xml.bind.JAXBElement + jakarta.xml.bind.JAXBElement Application supplied JAXB classes (types annotated with - @XmlRootElement - or@XmlType) + @XmlRootElement + or@XmlType) Form content (application/x-www-form-urlencoded) diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java index 0718577b79..01feb3ca64 100644 --- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java +++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Book.java @@ -26,9 +26,9 @@ package org.glassfish.jersey.examples.bookstore.webapp.resource; -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/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java index 6b102e17ab..8103f42af6 100644 --- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java +++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Bookstore.java @@ -38,9 +38,9 @@ import jakarta.ws.rs.core.Response; import javax.inject.Singleton; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java index 4ed740db14..9799fe42e2 100644 --- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java +++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/CD.java @@ -31,9 +31,9 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.core.Response; -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/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java index bd7b97286f..99f630fd2f 100644 --- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java +++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java @@ -30,9 +30,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java index ba4d6908d3..da79d253aa 100644 --- a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java +++ b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Track.java @@ -30,9 +30,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemRepresentation.java b/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemRepresentation.java index ef04219996..bfaeaa17de 100644 --- a/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemRepresentation.java +++ b/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemRepresentation.java @@ -14,13 +14,13 @@ import jakarta.ws.rs.core.Link; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.glassfish.jersey.examples.linking.model.ItemsModel; import org.glassfish.jersey.examples.linking.resources.ItemResource; diff --git a/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemsRepresentation.java b/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemsRepresentation.java index 7c20ea9519..4d702a287e 100644 --- a/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemsRepresentation.java +++ b/examples/declarative-linking/src/main/java/org/glassfish/jersey/examples/linking/representation/ItemsRepresentation.java @@ -15,13 +15,13 @@ import jakarta.ws.rs.core.Link; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.glassfish.jersey.examples.linking.model.ItemsModel; import org.glassfish.jersey.examples.linking.resources.ItemsResource; diff --git a/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedEntity.java b/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedEntity.java index 324ab22dd0..07beaa6c39 100644 --- a/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedEntity.java +++ b/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedEntity.java @@ -13,7 +13,7 @@ import javax.annotation.security.DenyAll; import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Restricted entity to demonstrate various security annotations. diff --git a/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedSubEntity.java b/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedSubEntity.java index aabc845529..68153c3452 100644 --- a/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedSubEntity.java +++ b/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/domain/RestrictedSubEntity.java @@ -11,7 +11,7 @@ package org.glassfish.jersey.examples.entityfiltering.security.domain; import javax.annotation.security.RolesAllowed; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Restricted sub-entity to demonstrate that security entity-filtering is transitive. diff --git a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Address.java b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Address.java index cc4edbbd77..8088cf22c6 100644 --- a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Address.java +++ b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Address.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.entityfiltering.selectable.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Address { diff --git a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Person.java b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Person.java index 8d4b9b5af9..144a026a56 100644 --- a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Person.java +++ b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/Person.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Person { diff --git a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/PhoneNumber.java b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/PhoneNumber.java index de8e89e246..4877acc92f 100644 --- a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/PhoneNumber.java +++ b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/domain/PhoneNumber.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.entityfiltering.selectable.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class PhoneNumber { diff --git a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Project.java b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Project.java index 8533ea938a..37d9a19a63 100644 --- a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Project.java +++ b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Project.java @@ -12,7 +12,7 @@ import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.examples.entityfiltering.filtering.ProjectDetailedView; diff --git a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Task.java b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Task.java index dd7d889e4c..c558d2f9d2 100644 --- a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Task.java +++ b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/Task.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.entityfiltering.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.examples.entityfiltering.filtering.TaskDetailedView; diff --git a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/User.java b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/User.java index 5a2673fe79..3bb6a94eae 100644 --- a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/User.java +++ b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/domain/User.java @@ -12,7 +12,7 @@ import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.examples.entityfiltering.filtering.UserDetailedView; diff --git a/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/RootResource.java b/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/RootResource.java index 3b7a011801..0c00643c68 100644 --- a/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/RootResource.java +++ b/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/RootResource.java @@ -11,7 +11,7 @@ package org.glassfish.jersey.examples.httpsclientservergrizzly; import java.nio.charset.Charset; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; diff --git a/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/SecurityFilter.java b/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/SecurityFilter.java index 3029ead456..c537e18071 100644 --- a/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/SecurityFilter.java +++ b/examples/https-clientserver-grizzly/src/main/java/org/glassfish/jersey/examples/httpsclientservergrizzly/SecurityFilter.java @@ -25,7 +25,7 @@ import javax.inject.Inject; import java.nio.charset.Charset; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; /** * Simple authentication filter. diff --git a/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbResource.java b/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbResource.java index 4c9edd1b7e..069c16d759 100644 --- a/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbResource.java +++ b/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbResource.java @@ -16,7 +16,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.glassfish.jersey.message.XmlHeader; diff --git a/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlRootElement.java b/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlRootElement.java index ceb6294506..3e6b74833d 100644 --- a/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlRootElement.java +++ b/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlRootElement.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.jaxb; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class JaxbXmlRootElement { diff --git a/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlType.java b/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlType.java index d09baccd3c..362c684b2f 100644 --- a/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlType.java +++ b/examples/jaxb/src/main/java/org/glassfish/jersey/examples/jaxb/JaxbXmlType.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.jaxb; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; @XmlType public class JaxbXmlType { diff --git a/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java b/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java index d610f1f30a..33047573f9 100644 --- a/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java +++ b/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java @@ -16,7 +16,7 @@ import jakarta.ws.rs.core.GenericType; import static jakarta.ws.rs.client.Entity.xml; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.glassfish.jersey.server.ResourceConfig; diff --git a/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/CombinedAnnotationBean.java b/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/CombinedAnnotationBean.java index 05e3e17bf8..6ae18af084 100644 --- a/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/CombinedAnnotationBean.java +++ b/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/CombinedAnnotationBean.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.jackson; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/EmptyArrayBean.java b/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/EmptyArrayBean.java index e3e620fbc7..4a60699b2f 100644 --- a/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/EmptyArrayBean.java +++ b/examples/json-jackson/src/main/java/org/glassfish/jersey/examples/jackson/EmptyArrayBean.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.jackson; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * TODO javadoc. diff --git a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/AircraftType.java b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/AircraftType.java index f56fe45eb7..e9024bc7e7 100644 --- a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/AircraftType.java +++ b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/AircraftType.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.jettison; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * TODO javadoc. diff --git a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/FlightType.java b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/FlightType.java index e88161a91e..d7f0082410 100644 --- a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/FlightType.java +++ b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/FlightType.java @@ -17,10 +17,10 @@ package org.glassfish.jersey.examples.jettison; import java.util.Formatter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; /** *

Java class for flightType complex type. diff --git a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/Flights.java b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/Flights.java index 325fbce38c..4e0c8bc603 100644 --- a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/Flights.java +++ b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/Flights.java @@ -18,11 +18,11 @@ 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.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; /** *

Java class for anonymous complex type. diff --git a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/JaxbContextResolver.java b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/JaxbContextResolver.java index 99655f24dd..1e82f8899f 100644 --- a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/JaxbContextResolver.java +++ b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/JaxbContextResolver.java @@ -17,7 +17,7 @@ import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.glassfish.jersey.jettison.JettisonConfig; import org.glassfish.jersey.jettison.JettisonJaxbContext; diff --git a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/ObjectFactory.java b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/ObjectFactory.java index b16560bf5e..ec10e02d66 100644 --- a/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/ObjectFactory.java +++ b/examples/json-jettison/src/main/java/org/glassfish/jersey/examples/jettison/ObjectFactory.java @@ -16,7 +16,7 @@ // package org.glassfish.jersey.examples.jettison; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/examples/json-moxy/src/main/java/org/glassfish/jersey/examples/jsonmoxy/TestBean.java b/examples/json-moxy/src/main/java/org/glassfish/jersey/examples/jsonmoxy/TestBean.java index 079d524623..b4de73b80e 100644 --- a/examples/json-moxy/src/main/java/org/glassfish/jersey/examples/jsonmoxy/TestBean.java +++ b/examples/json-moxy/src/main/java/org/glassfish/jersey/examples/jsonmoxy/TestBean.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.jsonmoxy; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Pavel Bucek diff --git a/examples/json-with-padding/src/main/java/org/glassfish/jersey/examples/jsonp/ChangeRecordBean.java b/examples/json-with-padding/src/main/java/org/glassfish/jersey/examples/jsonp/ChangeRecordBean.java index 5475ffbb98..beb0a9a800 100644 --- a/examples/json-with-padding/src/main/java/org/glassfish/jersey/examples/jsonp/ChangeRecordBean.java +++ b/examples/json-with-padding/src/main/java/org/glassfish/jersey/examples/jsonp/ChangeRecordBean.java @@ -10,8 +10,8 @@ package org.glassfish.jersey.examples.jsonp; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/examples/multipart-webapp/src/main/java/org/glassfish/jersey/examples/multipart/webapp/Bean.java b/examples/multipart-webapp/src/main/java/org/glassfish/jersey/examples/multipart/webapp/Bean.java index dc59cd531d..8988f28809 100644 --- a/examples/multipart-webapp/src/main/java/org/glassfish/jersey/examples/multipart/webapp/Bean.java +++ b/examples/multipart-webapp/src/main/java/org/glassfish/jersey/examples/multipart/webapp/Bean.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.multipart.webapp; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Bean { diff --git a/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/Status.java b/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/Status.java index 34f2abe85d..5e3fd00f0e 100644 --- a/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/Status.java +++ b/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/Status.java @@ -10,8 +10,8 @@ package org.glassfish.jersey.examples.oauth.twitterclient; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/User.java b/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/User.java index 9be25712c2..4b4c696620 100644 --- a/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/User.java +++ b/examples/oauth-client-twitter/src/main/java/org/glassfish/jersey/examples/oauth/twitterclient/User.java @@ -10,8 +10,8 @@ package org.glassfish.jersey.examples.oauth.twitterclient; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/examples/pom.xml b/examples/pom.xml index 9c312426cc..e1e96a1d7f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -64,7 +64,7 @@ - extended-wadl-webapp + exception-mapping freemarker-webapp @@ -124,6 +124,12 @@ webapp-example-parent + + + exluded_due_to_jakartification + extended-wadl-webapp + + diff --git a/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Calculation.java b/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Calculation.java index 1d5a1415cb..1b36596a12 100644 --- a/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Calculation.java +++ b/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Calculation.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.rx.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Michal Gajdos diff --git a/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Forecast.java b/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Forecast.java index 95ee20ca11..8c0e7860e5 100644 --- a/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Forecast.java +++ b/examples/rx-client-webapp/src/main/java/org/glassfish/jersey/examples/rx/domain/Forecast.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.rx.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Michal Gajdos diff --git a/examples/server-async-managed/src/main/java/org/glassfish/jersey/examples/server/async/managed/Message.java b/examples/server-async-managed/src/main/java/org/glassfish/jersey/examples/server/async/managed/Message.java index a84771ebb4..d368249d4e 100644 --- a/examples/server-async-managed/src/main/java/org/glassfish/jersey/examples/server/async/managed/Message.java +++ b/examples/server-async-managed/src/main/java/org/glassfish/jersey/examples/server/async/managed/Message.java @@ -11,7 +11,7 @@ package org.glassfish.jersey.examples.server.async.managed; import java.util.Date; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Chat message JAXB POJO. diff --git a/examples/sse-twitter-aggregator/src/main/java/org/glassfish/jersey/examples/aggregator/Message.java b/examples/sse-twitter-aggregator/src/main/java/org/glassfish/jersey/examples/aggregator/Message.java index 2f324cc922..51d40e9bc0 100644 --- a/examples/sse-twitter-aggregator/src/main/java/org/glassfish/jersey/examples/aggregator/Message.java +++ b/examples/sse-twitter-aggregator/src/main/java/org/glassfish/jersey/examples/aggregator/Message.java @@ -10,7 +10,7 @@ package org.glassfish.jersey.examples.aggregator; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; import org.eclipse.persistence.oxm.annotations.XmlPath; diff --git a/examples/xml-moxy/README.MD b/examples/xml-moxy/README.MD index 8c67e04efb..f9039b467a 100644 --- a/examples/xml-moxy/README.MD +++ b/examples/xml-moxy/README.MD @@ -83,7 +83,7 @@ Jersey use MOXy runtime, you just need to put a `jaxb.properties` file into the Java package containing your JAXB beans. The file should have the following content: - javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory + jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory Concrete file used in this example is placed under diff --git a/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/Customer.java b/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/Customer.java index cafcef43e7..fabf4e8d8b 100644 --- a/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/Customer.java +++ b/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/Customer.java @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.eclipse.persistence.oxm.annotations.XmlPath; diff --git a/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/PhoneNumber.java b/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/PhoneNumber.java index 14a09290b3..d8379a66f2 100644 --- a/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/PhoneNumber.java +++ b/examples/xml-moxy/src/main/java/org/glassfish/jersey/examples/xmlmoxy/beans/PhoneNumber.java @@ -10,8 +10,8 @@ package org.glassfish.jersey.examples.xmlmoxy.beans; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlValue; /** * diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/ValidationError.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/ValidationError.java index cf2f1c454f..8a5f026cbe 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/ValidationError.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/ValidationError.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.server.validation; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Default validation error entity to be included in {@code Response}. diff --git a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/FilteringHelper.java b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/FilteringHelper.java index 6704754891..922ebee4c6 100644 --- a/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/FilteringHelper.java +++ b/ext/entity-filtering/src/main/java/org/glassfish/jersey/message/filtering/spi/FilteringHelper.java @@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.glassfish.jersey.internal.util.ReflectionHelper; diff --git a/ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/MyBean.java b/ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/MyBean.java index 099aebfccc..95b8766a59 100644 --- a/ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/MyBean.java +++ b/ext/proxy-client/src/test/java/org/glassfish/jersey/client/proxy/MyBean.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.client.proxy; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class MyBean { diff --git a/ext/wadl-doclet/src/main/java/org/glassfish/jersey/wadl/doclet/DocletUtils.java b/ext/wadl-doclet/src/main/java/org/glassfish/jersey/wadl/doclet/DocletUtils.java index 4dea216a86..34d3137192 100644 --- a/ext/wadl-doclet/src/main/java/org/glassfish/jersey/wadl/doclet/DocletUtils.java +++ b/ext/wadl-doclet/src/main/java/org/glassfish/jersey/wadl/doclet/DocletUtils.java @@ -28,8 +28,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model.ResourceDocType; diff --git a/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java b/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java index 1c98aefb0a..a91266223d 100644 --- a/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java +++ b/ext/wadl-doclet/src/main/java8_11/org/glassfish/jersey/wadl/doclet/ResourceDoclet.java @@ -39,8 +39,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; import javax.xml.namespace.QName; import org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model.AnnotationDocType; diff --git a/incubator/declarative-linking/src/main/java/org/glassfish/jersey/linking/FieldProcessor.java b/incubator/declarative-linking/src/main/java/org/glassfish/jersey/linking/FieldProcessor.java index 9948559733..6648c3fd3f 100644 --- a/incubator/declarative-linking/src/main/java/org/glassfish/jersey/linking/FieldProcessor.java +++ b/incubator/declarative-linking/src/main/java/org/glassfish/jersey/linking/FieldProcessor.java @@ -29,7 +29,7 @@ import jakarta.ws.rs.core.Link; import jakarta.ws.rs.core.UriInfo; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.linking.contributing.ResourceLinkContributionContext; import org.glassfish.jersey.linking.mapping.ResourceMappingContext; diff --git a/incubator/declarative-linking/src/test/java/org/glassfish/jersey/linking/FieldProcessorTest.java b/incubator/declarative-linking/src/test/java/org/glassfish/jersey/linking/FieldProcessorTest.java index 6e4dd0c6cd..020a4d6d8f 100644 --- a/incubator/declarative-linking/src/test/java/org/glassfish/jersey/linking/FieldProcessorTest.java +++ b/incubator/declarative-linking/src/test/java/org/glassfish/jersey/linking/FieldProcessorTest.java @@ -38,7 +38,7 @@ import jakarta.ws.rs.core.PathSegment; import jakarta.ws.rs.core.UriBuilder; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap; import org.glassfish.jersey.linking.contributing.ResourceLinkContributionContext; diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml index 3b872cf935..a2eace3d4f 100644 --- a/media/jaxb/pom.xml +++ b/media/jaxb/pom.xml @@ -104,7 +104,7 @@ true - javax.xml.bind.*;version="!",* + jakarta.xml.bind.*;version="!",* org.glassfish.jersey.jaxb.*;version=${project.version} true diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractCollectionJaxbProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractCollectionJaxbProvider.java index c7990ac87e..441023feae 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractCollectionJaxbProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractCollectionJaxbProvider.java @@ -44,13 +44,13 @@ import jakarta.ws.rs.core.NoContentException; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -261,7 +261,7 @@ public final void writeTo( * @param c the charset * @param m the marshaller * @param entityStream the output stream to marshall the collection - * @throws javax.xml.bind.JAXBException in case the marshalling of element collection fails. + * @throws jakarta.xml.bind.JAXBException in case the marshalling of element collection fails. * @throws IOException in case of any other I/O error while marshalling the collection of JAXB objects. */ public abstract void writeCollection(Class elementType, Collection t, @@ -425,8 +425,8 @@ protected final String getRootElementName(Class elementType) { /** * Get the element name for a given Java type. *

- * In case the element is annotated with a {@link javax.xml.bind.annotation.XmlRootElement} annotation - * and the {@link javax.xml.bind.annotation.XmlRootElement#name() specified element name} is not default, + * In case the element is annotated with a {@link jakarta.xml.bind.annotation.XmlRootElement} annotation + * and the {@link jakarta.xml.bind.annotation.XmlRootElement#name() specified element name} is not default, * the method returns the specified element name in the annotation. Otherwise, the method returns the name of * the element class instead. *

diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbElementProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbElementProvider.java index 350afdc96f..ec53720ddd 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbElementProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbElementProvider.java @@ -32,11 +32,11 @@ import jakarta.ws.rs.core.NoContentException; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; import org.glassfish.jersey.internal.LocalizationMessages; import org.glassfish.jersey.message.internal.EntityInputStream; diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbProvider.java index a7fbeee9a2..4308b7996c 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractJaxbProvider.java @@ -30,11 +30,11 @@ import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.sax.SAXSource; diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractRootElementJaxbProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractRootElementJaxbProvider.java index eb0753b63e..fa12ef9b21 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractRootElementJaxbProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/AbstractRootElementJaxbProvider.java @@ -31,12 +31,12 @@ import jakarta.ws.rs.core.NoContentException; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.transform.stream.StreamSource; import org.glassfish.jersey.internal.LocalizationMessages; @@ -126,7 +126,7 @@ public final Object readFrom( * @param u the unmarshaller to use for unmarshalling. * @param entityStream the input stream to unmarshal from. * @return an instance of the JAXB type. - * @throws javax.xml.bind.JAXBException in case the JAXB unmarshalling fails. + * @throws jakarta.xml.bind.JAXBException in case the JAXB unmarshalling fails. */ protected Object readFrom(Class type, MediaType mediaType, Unmarshaller u, InputStream entityStream) @@ -170,7 +170,7 @@ public final void writeTo( * @param c the character set to serialize characters to. * @param m the marshaller to marshaller the instance of the JAXB type. * @param entityStream the output stream to marshal to. - * @throws javax.xml.bind.JAXBException in case the JAXB marshalling fails. + * @throws jakarta.xml.bind.JAXBException in case the JAXB marshalling fails. */ protected void writeTo(Object t, MediaType mediaType, Charset c, Marshaller m, OutputStream entityStream) diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProvider.java index 8e7d736369..8f536f11b9 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProvider.java @@ -29,12 +29,12 @@ import jakarta.ws.rs.ext.Providers; import javax.inject.Provider; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.sax.SAXSource; diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlCollectionJaxbProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlCollectionJaxbProvider.java index 49ba86bedd..eaab0361fd 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlCollectionJaxbProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlCollectionJaxbProvider.java @@ -32,10 +32,10 @@ import javax.inject.Provider; import javax.inject.Singleton; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlJaxbElementProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlJaxbElementProvider.java index 8cf6545ffb..34b2897c79 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlJaxbElementProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlJaxbElementProvider.java @@ -28,10 +28,10 @@ import javax.inject.Provider; import javax.inject.Singleton; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.parsers.SAXParserFactory; /** diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootElementJaxbProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootElementJaxbProvider.java index 168f04deb2..5e042dfe91 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootElementJaxbProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootElementJaxbProvider.java @@ -26,10 +26,10 @@ import javax.inject.Provider; import javax.inject.Singleton; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.sax.SAXSource; diff --git a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootObjectJaxbProvider.java b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootObjectJaxbProvider.java index 592204835e..7da5d2cd37 100644 --- a/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootObjectJaxbProvider.java +++ b/media/jaxb/src/main/java/org/glassfish/jersey/jaxb/internal/XmlRootObjectJaxbProvider.java @@ -35,10 +35,10 @@ import javax.inject.Provider; import javax.inject.Singleton; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.parsers.SAXParserFactory; import org.glassfish.jersey.message.internal.EntityInputStream; diff --git a/media/jaxb/src/test/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProviderTest.java b/media/jaxb/src/test/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProviderTest.java index 8457eafd6c..3afb76d9f3 100644 --- a/media/jaxb/src/test/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProviderTest.java +++ b/media/jaxb/src/test/java/org/glassfish/jersey/jaxb/internal/JaxbStringReaderProviderTest.java @@ -32,7 +32,7 @@ import jakarta.ws.rs.ext.Providers; import javax.inject.Provider; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import javax.xml.parsers.SAXParserFactory; import org.glassfish.jersey.model.internal.CommonConfig; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonJaxbContext.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonJaxbContext.java index 1ed6125208..8d6280228e 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonJaxbContext.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonJaxbContext.java @@ -18,11 +18,11 @@ import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.Validator; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.Validator; import org.glassfish.jersey.jettison.internal.BaseJsonMarshaller; import org.glassfish.jersey.jettison.internal.BaseJsonUnmarshaller; @@ -30,7 +30,7 @@ import org.glassfish.jersey.jettison.internal.JettisonJaxbUnmarshaller; /** - * An adaption of {@link javax.xml.bind.JAXBContext} that supports marshalling + * An adaption of {@link jakarta.xml.bind.JAXBContext} that supports marshalling * and unmarshalling of JAXB beans using the JSON format. *

* The JSON format may be configured by using a {@link JettisonConfig} object @@ -47,7 +47,7 @@ public final class JettisonJaxbContext extends JAXBContext implements JettisonCo * @param classesToBeBound list of java classes to be recognized by the * new JsonJaxbContext. Can be empty, in which case a JsonJaxbContext * that only knows about spec-defined classes will be returned. - * @throws javax.xml.bind.JAXBException if an error was encountered while creating the + * @throws jakarta.xml.bind.JAXBException if an error was encountered while creating the * underlying JAXBContext. */ public JettisonJaxbContext(Class... classesToBeBound) throws JAXBException { @@ -61,7 +61,7 @@ public JettisonJaxbContext(Class... classesToBeBound) throws JAXBException { * @param classesToBeBound list of java classes to be recognized by the * new JsonJaxbContext. Can be empty, in which case a JsonJaxbContext * that only knows about spec-defined classes will be returned. - * @throws javax.xml.bind.JAXBException if an error was encountered while creating the + * @throws jakarta.xml.bind.JAXBException if an error was encountered while creating the * underlying JAXBContext. */ public JettisonJaxbContext(final JettisonConfig config, final Class... classesToBeBound) throws JAXBException { @@ -83,7 +83,7 @@ public JettisonJaxbContext(final JettisonConfig config, final Class... classesTo * that only knows about spec-defined classes will be returned. * @param properties the custom set of properties. If it contains(now deprecated) JSON related properties, * then a non-default {@link JettisonConfig} is used reflecting the JSON properties - * @throws javax.xml.bind.JAXBException if an error was encountered while creating the + * @throws jakarta.xml.bind.JAXBException if an error was encountered while creating the * underlying JAXBContext. */ public JettisonJaxbContext(Class[] classesToBeBound, Map properties) @@ -105,7 +105,7 @@ public JettisonJaxbContext(Class[] classesToBeBound, Map propert * new JsonJaxbContext. Can be empty, in which case a JsonJaxbContext * that only knows about spec-defined classes will be returned. * @param properties the custom set of properties. - * @throws javax.xml.bind.JAXBException if an error was encountered while creating the + * @throws jakarta.xml.bind.JAXBException if an error was encountered while creating the * underlying JAXBContext. */ public JettisonJaxbContext(final JettisonConfig config, final Class[] classesToBeBound, final Map properties) @@ -203,7 +203,7 @@ public JettisonJaxbContext(String contextPath, ClassLoader classLoader, Map properties) @@ -217,7 +217,7 @@ public JettisonJaxbContext(JettisonConfig config, String contextPath, ClassLoade } /** - * Get a {@link org.glassfish.jersey.jettison.JettisonMarshaller} from a {@link javax.xml.bind.Marshaller}. + * Get a {@link org.glassfish.jersey.jettison.JettisonMarshaller} from a {@link jakarta.xml.bind.Marshaller}. * * @param marshaller the JAXB marshaller. * @return the JSON marshaller. @@ -232,7 +232,7 @@ public static org.glassfish.jersey.jettison.JettisonMarshaller getJSONMarshaller } /** - * Get a {@link org.glassfish.jersey.jettison.JettisonUnmarshaller} from a {@link javax.xml.bind.Unmarshaller}. + * Get a {@link org.glassfish.jersey.jettison.JettisonUnmarshaller} from a {@link jakarta.xml.bind.Unmarshaller}. * * @param unmarshaller the JAXB unmarshaller. * @return the JSON unmarshaller. @@ -260,7 +260,7 @@ public JettisonConfig getJSONConfiguration() { * * @return the JSON unmarshaller * - * @throws javax.xml.bind.JAXBException if there is an error creating the unmarshaller. + * @throws jakarta.xml.bind.JAXBException if there is an error creating the unmarshaller. */ public org.glassfish.jersey.jettison.JettisonUnmarshaller createJsonUnmarshaller() throws JAXBException { return new JettisonJaxbUnmarshaller(this, getJSONConfiguration()); @@ -271,7 +271,7 @@ public org.glassfish.jersey.jettison.JettisonUnmarshaller createJsonUnmarshaller * * @return the JSON marshaller. * - * @throws javax.xml.bind.JAXBException if there is an error creating the marshaller. + * @throws jakarta.xml.bind.JAXBException if there is an error creating the marshaller. */ public org.glassfish.jersey.jettison.JettisonMarshaller createJsonMarshaller() throws JAXBException { return new JettisonJaxbMarshaller(this, getJSONConfiguration()); @@ -282,7 +282,7 @@ public org.glassfish.jersey.jettison.JettisonMarshaller createJsonMarshaller() t * an unmarshaller which is capable of JSON deserialization. * * @return unmarshaller instance with JSON capabilities - * @throws javax.xml.bind.JAXBException + * @throws jakarta.xml.bind.JAXBException */ @Override public Unmarshaller createUnmarshaller() throws JAXBException { @@ -294,7 +294,7 @@ public Unmarshaller createUnmarshaller() throws JAXBException { * a marshaller which is capable of JSON serialization. * * @return marshaller instance with JSON capabilities - * @throws javax.xml.bind.JAXBException + * @throws jakarta.xml.bind.JAXBException */ @Override public Marshaller createMarshaller() throws JAXBException { @@ -305,7 +305,7 @@ public Marshaller createMarshaller() throws JAXBException { * Simply delegates to underlying JAXBContext implementation. * * @return what underlying JAXBContext returns - * @throws javax.xml.bind.JAXBException + * @throws jakarta.xml.bind.JAXBException */ @Override public Validator createValidator() throws JAXBException { diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonMarshaller.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonMarshaller.java index 49392e1d48..3fc5ebb9ce 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonMarshaller.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonMarshaller.java @@ -19,8 +19,8 @@ import java.io.OutputStream; import java.io.Writer; -import javax.xml.bind.JAXBException; -import javax.xml.bind.PropertyException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.PropertyException; /** * A JSON marshaller responsible for serializing Java content trees, defined @@ -37,16 +37,16 @@ public interface JettisonMarshaller { * Marshall the content tree rooted at jaxbElement into an * output stream. The content tree may be an instance of a class that is * mapped to a XML root element (for example, annotated with - * {@link javax.xml.bind.annotation.XmlRootElement}) or an instance of {@link javax.xml.bind.JAXBElement}. + * {@link jakarta.xml.bind.annotation.XmlRootElement}) or an instance of {@link jakarta.xml.bind.JAXBElement}. *

* The UTF-8 character encoding scheme will be used to encode the characters * of the JSON data. * * @param jaxbElement the root of the content tree to be marshalled. * @param os the JSON will be added to this stream. - * @throws javax.xml.bind.JAXBException if any unexpected problem occurs during the + * @throws jakarta.xml.bind.JAXBException if any unexpected problem occurs during the * marshalling. - * @throws javax.xml.bind.MarshalException if the JsonMarshaller is unable to + * @throws jakarta.xml.bind.MarshalException if the JsonMarshaller is unable to * marshal jaxbElement (or any object reachable from obj) * @throws IllegalArgumentException if any of the method parameters are null. * @@ -57,16 +57,16 @@ public interface JettisonMarshaller { * Marshall the content tree rooted at jaxbElement into an * output stream. The content tree may be an instance of a class that is * mapped to a XML root element (for example, annotated with - * {@link javax.xml.bind.annotation.XmlRootElement}) or an instance of {@link javax.xml.bind.JAXBElement}. + * {@link jakarta.xml.bind.annotation.XmlRootElement}) or an instance of {@link jakarta.xml.bind.JAXBElement}. *

* The character encoding scheme of the writer will be used to * encode the characters of the JSON data. * * @param jaxbElement the root of the content tree to be marshalled. * @param writer the JSON will be added to this writer. - * @throws javax.xml.bind.JAXBException if any unexpected problem occurs during the + * @throws jakarta.xml.bind.JAXBException if any unexpected problem occurs during the * marshalling. - * @throws javax.xml.bind.MarshalException if the JsonMarshaller is unable to + * @throws jakarta.xml.bind.MarshalException if the JsonMarshaller is unable to * marshal jaxbElement (or any object reachable from obj) * @throws IllegalArgumentException If any of the method parameters are null. */ @@ -82,7 +82,7 @@ public interface JettisonMarshaller { * supplied string. * @param value the value of the property to be set * - * @throws javax.xml.bind.PropertyException when there is an error processing the given + * @throws jakarta.xml.bind.PropertyException when there is an error processing the given * property or value * @throws IllegalArgumentException * If the name parameter is null diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonUnmarshaller.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonUnmarshaller.java index a3be31a7b8..46630e2cc8 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonUnmarshaller.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/JettisonUnmarshaller.java @@ -19,8 +19,8 @@ import java.io.InputStream; import java.io.Reader; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; /** * A JSON unmarshaller responsible for deserializing JSON data to a Java @@ -44,10 +44,10 @@ public interface JettisonUnmarshaller { * @return the newly created root object of the Java content tree. The * content tree may be an instance of a class that is * mapped to a XML root element (for example, annotated with - * {@link javax.xml.bind.annotation.XmlRootElement}) or mapped to an XML type (for example, - * annotated with {@link javax.xml.bind.annotation.XmlType}). - * @throws javax.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. - * @throws javax.xml.bind.UnmarshalException if the JsonUnmarshaller is unable + * {@link jakarta.xml.bind.annotation.XmlRootElement}) or mapped to an XML type (for example, + * annotated with {@link jakarta.xml.bind.annotation.XmlType}). + * @throws jakarta.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. + * @throws jakarta.xml.bind.UnmarshalException if the JsonUnmarshaller is unable * to perform the JSON to Java binding. */ T unmarshalFromJSON(InputStream is, Class expectedType) throws JAXBException; @@ -65,10 +65,10 @@ public interface JettisonUnmarshaller { * @return the newly created root object of the Java content tree. The * content tree may be an instance of a class that is * mapped to a XML root element (for example, annotated with - * {@link javax.xml.bind.annotation.XmlRootElement}) or mapped to an XML type (for example, - * annotated with {@link javax.xml.bind.annotation.XmlType}). - * @throws javax.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. - * @throws javax.xml.bind.UnmarshalException if the JsonUnmarshaller is unable + * {@link jakarta.xml.bind.annotation.XmlRootElement}) or mapped to an XML type (for example, + * annotated with {@link jakarta.xml.bind.annotation.XmlType}). + * @throws jakarta.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. + * @throws jakarta.xml.bind.UnmarshalException if the JsonUnmarshaller is unable * to perform the JSON to Java binding. */ T unmarshalFromJSON(Reader reader, Class expectedType) throws JAXBException; @@ -83,12 +83,12 @@ public interface JettisonUnmarshaller { * @param the type of the Java content tree. * @param is the InputStream to unmarshal JSON data from. * @param declaredType a class that is mapped to a XML root element - * (for example, annotated with {@link javax.xml.bind.annotation.XmlRootElement}) or mapped to - * an XML type (for example, annotated with {@link javax.xml.bind.annotation.XmlType}). + * (for example, annotated with {@link jakarta.xml.bind.annotation.XmlRootElement}) or mapped to + * an XML type (for example, annotated with {@link jakarta.xml.bind.annotation.XmlType}). * @return the newly created root object of the Java content tree, root - * by a {@link javax.xml.bind.JAXBElement} instance. - * @throws javax.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. - * @throws javax.xml.bind.UnmarshalException if the JsonUnmarshaller is unable + * by a {@link jakarta.xml.bind.JAXBElement} instance. + * @throws jakarta.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. + * @throws jakarta.xml.bind.UnmarshalException if the JsonUnmarshaller is unable * to perform the JSON to Java binding. */ JAXBElement unmarshalJAXBElementFromJSON(InputStream is, Class declaredType) throws JAXBException; @@ -103,12 +103,12 @@ public interface JettisonUnmarshaller { * @param the type of the Java content tree. * @param reader the Reader to unmarshal JSON data from. * @param declaredType a class that is mapped to a XML root element - * (for example, annotated with {@link javax.xml.bind.annotation.XmlRootElement}) or mapped to - * an XML type (for example, annotated with {@link javax.xml.bind.annotation.XmlType}). + * (for example, annotated with {@link jakarta.xml.bind.annotation.XmlRootElement}) or mapped to + * an XML type (for example, annotated with {@link jakarta.xml.bind.annotation.XmlType}). * @return the newly created root object of the Java content tree, root - * by a {@link javax.xml.bind.JAXBElement} instance. - * @throws javax.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. - * @throws javax.xml.bind.UnmarshalException if the JsonUnmarshaller is unable + * by a {@link jakarta.xml.bind.JAXBElement} instance. + * @throws jakarta.xml.bind.JAXBException if any unexpected errors occur while unmarshalling. + * @throws jakarta.xml.bind.UnmarshalException if the JsonUnmarshaller is unable * to perform the JSON to Java binding. */ JAXBElement unmarshalJAXBElementFromJSON(Reader reader, Class declaredType) throws JAXBException; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonMarshaller.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonMarshaller.java index bc2bf14fec..73ecae73d0 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonMarshaller.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonMarshaller.java @@ -22,10 +22,10 @@ import java.io.Writer; import java.nio.charset.Charset; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; import javax.xml.stream.XMLStreamWriter; import org.glassfish.jersey.jettison.JettisonConfig; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonUnmarshaller.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonUnmarshaller.java index c9c4867c1a..ee63684582 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonUnmarshaller.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/BaseJsonUnmarshaller.java @@ -21,12 +21,12 @@ import java.io.Reader; import java.nio.charset.Charset; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbMarshaller.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbMarshaller.java index 3200cba360..b55f55616a 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbMarshaller.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbMarshaller.java @@ -20,13 +20,13 @@ import java.io.OutputStream; import java.io.Writer; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.attachment.AttachmentMarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.attachment.AttachmentMarshaller; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbUnmarshaller.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbUnmarshaller.java index e6b7d05173..6ffe5a3426 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbUnmarshaller.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/JettisonJaxbUnmarshaller.java @@ -21,15 +21,15 @@ import java.io.Reader; import java.net.URL; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.PropertyException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.UnmarshallerHandler; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.attachment.AttachmentUnmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.UnmarshallerHandler; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.attachment.AttachmentUnmarshaller; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.Source; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonJaxbElementProvider.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonJaxbElementProvider.java index e1520316ce..51ec8ad7b6 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonJaxbElementProvider.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonJaxbElementProvider.java @@ -30,17 +30,17 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.glassfish.jersey.jaxb.internal.AbstractJaxbElementProvider; import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.glassfish.jersey.jettison.JettisonMarshaller; /** - * JSON message entity media type provider (reader & writer) for {@link javax.xml.bind.JAXBElement} + * JSON message entity media type provider (reader & writer) for {@link jakarta.xml.bind.JAXBElement} * type. * * @author Jakub Podlesak diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonListElementProvider.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonListElementProvider.java index d77263aef4..8f6395b9ff 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonListElementProvider.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonListElementProvider.java @@ -34,9 +34,9 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; diff --git a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonRootElementProvider.java b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonRootElementProvider.java index 13d5912bcc..71e4810d5c 100644 --- a/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonRootElementProvider.java +++ b/media/json-jettison/src/main/java/org/glassfish/jersey/jettison/internal/entity/JettisonRootElementProvider.java @@ -30,9 +30,9 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.glassfish.jersey.jaxb.internal.AbstractRootElementJaxbProvider; import org.glassfish.jersey.jettison.JettisonJaxbContext; @@ -40,8 +40,8 @@ /** * JSON message entity media type provider (reader & writer) for JAXB types that - * are annotated with {@link javax.xml.bind.annotation.XmlRootElement @XmlRootElement} - * or {@link javax.xml.bind.annotation.XmlType @XmlType}. + * are annotated with {@link jakarta.xml.bind.annotation.XmlRootElement @XmlRootElement} + * or {@link jakarta.xml.bind.annotation.XmlType @XmlType}. * * @author Paul Sandoz * @author Jakub Podlesak diff --git a/media/moxy/src/main/java/org/glassfish/jersey/moxy/internal/MoxyObjectProvider.java b/media/moxy/src/main/java/org/glassfish/jersey/moxy/internal/MoxyObjectProvider.java index 4fd83f345e..5931f113b7 100644 --- a/media/moxy/src/main/java/org/glassfish/jersey/moxy/internal/MoxyObjectProvider.java +++ b/media/moxy/src/main/java/org/glassfish/jersey/moxy/internal/MoxyObjectProvider.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.glassfish.jersey.message.filtering.spi.AbstractObjectProvider; import org.glassfish.jersey.message.filtering.spi.ObjectGraph; diff --git a/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/MoxyJsonConfig.java b/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/MoxyJsonConfig.java index 378aa1b98c..8117563e04 100644 --- a/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/MoxyJsonConfig.java +++ b/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/MoxyJsonConfig.java @@ -20,7 +20,7 @@ import java.util.Map; import jakarta.ws.rs.ext.ContextResolver; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Marshaller; import org.eclipse.persistence.jaxb.MarshallerProperties; import org.eclipse.persistence.jaxb.UnmarshallerProperties; @@ -49,7 +49,7 @@ public MoxyJsonConfig() { * Create a new configuration for {@link org.eclipse.persistence.jaxb.rs.MOXyJsonProvider}. If the * {@code initDefaultProperties} is set to {@code true} then the following values are set: *

    - *
  • {@link javax.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT} - {@code false}
    • + *
  • {@link jakarta.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT} - {@code false}
    • *
  • {@link org.eclipse.persistence.jaxb.JAXBContextProperties#JSON_INCLUDE_ROOT} - {@code false}
    • *
  • {@link org.eclipse.persistence.jaxb.MarshallerProperties#JSON_MARSHAL_EMPTY_COLLECTIONS} - {@code true}
    • *
  • {@link org.eclipse.persistence.jaxb.JAXBContextProperties#JSON_NAMESPACE_SEPARATOR} - @@ -61,7 +61,7 @@ public MoxyJsonConfig() { */ public MoxyJsonConfig(final boolean initDefaultProperties) { if (initDefaultProperties) { - // javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT + // jakarta.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT setFormattedOutput(false); // org.eclipse.persistence.jaxb.JAXBContextProperties.JSON_INCLUDE_ROOT diff --git a/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/ConfigurableMoxyJsonProvider.java b/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/ConfigurableMoxyJsonProvider.java index 68a60c016f..142cba3264 100644 --- a/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/ConfigurableMoxyJsonProvider.java +++ b/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/ConfigurableMoxyJsonProvider.java @@ -33,10 +33,10 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Providers; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.Unmarshaller; import org.eclipse.persistence.internal.core.helper.CoreClassConstants; import org.eclipse.persistence.jaxb.MarshallerProperties; diff --git a/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/FilteringMoxyJsonProvider.java b/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/FilteringMoxyJsonProvider.java index a698962ef1..aa290009f8 100644 --- a/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/FilteringMoxyJsonProvider.java +++ b/media/moxy/src/main/java/org/glassfish/jersey/moxy/json/internal/FilteringMoxyJsonProvider.java @@ -25,9 +25,9 @@ import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.glassfish.jersey.message.filtering.spi.ObjectProvider; diff --git a/media/moxy/src/main/java/org/glassfish/jersey/moxy/xml/MoxyContextResolver.java b/media/moxy/src/main/java/org/glassfish/jersey/moxy/xml/MoxyContextResolver.java index 1431657ab1..a46df34a0e 100644 --- a/media/moxy/src/main/java/org/glassfish/jersey/moxy/xml/MoxyContextResolver.java +++ b/media/moxy/src/main/java/org/glassfish/jersey/moxy/xml/MoxyContextResolver.java @@ -25,8 +25,8 @@ import jakarta.ws.rs.ext.ContextResolver; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import org.eclipse.persistence.jaxb.JAXBContextFactory; import org.eclipse.persistence.jaxb.JAXBContextProperties; diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/BasicClientTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/BasicClientTest.java index 1b07c89aa1..479d9ddd30 100644 --- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/BasicClientTest.java +++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/BasicClientTest.java @@ -45,7 +45,7 @@ import jakarta.ws.rs.ext.WriterInterceptor; import jakarta.ws.rs.ext.WriterInterceptorContext; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientAsyncExecutor; import org.glassfish.jersey.client.ClientConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/CharsetTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/CharsetTest.java index 22c2176b96..f286519290 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/CharsetTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/CharsetTest.java @@ -37,7 +37,7 @@ import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.jettison.JettisonFeature; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyEntityTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyEntityTest.java index e6fda371ff..d0e14b52ed 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyEntityTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyEntityTest.java @@ -42,8 +42,8 @@ import jakarta.ws.rs.ext.MessageBodyWriter; import jakarta.ws.rs.ext.Provider; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.message.internal.ReaderWriter; import org.glassfish.jersey.test.TestProperties; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyRequestWithJaxbTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyRequestWithJaxbTest.java index 48af6b13cd..0611daab80 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyRequestWithJaxbTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyRequestWithJaxbTest.java @@ -29,8 +29,8 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ContextResolver; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.jettison.JettisonConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EntityTypesTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EntityTypesTest.java index e6ff03236f..a8ae24e83b 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EntityTypesTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EntityTypesTest.java @@ -59,9 +59,9 @@ import jakarta.ws.rs.ext.Provider; import javax.activation.DataSource; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.dom.DOMSource; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest.java index 5880de6305..426e767daa 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest.java @@ -27,11 +27,11 @@ import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.server.ResourceConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBean.java index 6acd2dfe74..3a1f6e56d2 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBean.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Doug Kohlert diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBeanType.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBeanType.java index deab480c28..bec6b911e7 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBeanType.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JaxbBeanType.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.entity; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JsonMoxyTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JsonMoxyTest.java index aaa4f751c0..8bb9aff7b7 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JsonMoxyTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JsonMoxyTest.java @@ -42,7 +42,7 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ContextResolver; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.glassfish.jersey.client.ClientConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XXETest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XXETest.java index 6d83b96559..1627b41621 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XXETest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XXETest.java @@ -30,7 +30,7 @@ import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.MediaType; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlJaxBElementProviderTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlJaxBElementProviderTest.java index 2cdb4b6bb7..d87fccfc5e 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlJaxBElementProviderTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlJaxBElementProviderTest.java @@ -29,7 +29,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import org.glassfish.jersey.server.ResourceConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlMoxyTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlMoxyTest.java index 77fb5792f1..0f75bc2df7 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlMoxyTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/XmlMoxyTest.java @@ -43,10 +43,10 @@ import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlRootElement; import javax.xml.namespace.QName; import org.glassfish.jersey.client.ClientConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexEntity.java index a6a36a2fc8..246e2e5925 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexEntity.java @@ -16,10 +16,10 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubEntity.java index 7676e3cbd2..db5a443f59 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubEntity.java @@ -16,10 +16,10 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubSubEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubSubEntity.java index be709e081a..7a7a27c067 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubSubEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ComplexSubSubEntity.java @@ -16,10 +16,10 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; import org.glassfish.jersey.tests.e2e.entity.filtering.SecondaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/DefaultFilteringSubEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/DefaultFilteringSubEntity.java index fcd3888731..be6f99ad74 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/DefaultFilteringSubEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/DefaultFilteringSubEntity.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/FilteredClassEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/FilteredClassEntity.java index b1ec5f8840..6f41b3ea05 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/FilteredClassEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/FilteredClassEntity.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import org.glassfish.jersey.tests.e2e.entity.filtering.TertiaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnClassEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnClassEntity.java index 8221fb9741..2ad9482266 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnClassEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnClassEntity.java @@ -19,10 +19,10 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; import org.glassfish.jersey.tests.e2e.entity.filtering.SecondaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnPropertiesEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnPropertiesEntity.java index f59b87d872..3d826d84f1 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnPropertiesEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsOnPropertiesEntity.java @@ -19,10 +19,10 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; import org.glassfish.jersey.tests.e2e.entity.filtering.SecondaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsSubEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsSubEntity.java index b326abcc2a..d277dfcb40 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsSubEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/ManyFilteringsSubEntity.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; import org.glassfish.jersey.tests.e2e.entity.filtering.SecondaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnClassEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnClassEntity.java index 55be9fc47d..1ee2fb5fb6 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnClassEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnClassEntity.java @@ -19,10 +19,10 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnPropertiesEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnPropertiesEntity.java index 43809e4759..4b967fc1a5 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnPropertiesEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringOnPropertiesEntity.java @@ -19,10 +19,10 @@ import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringSubEntity.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringSubEntity.java index 149ca05a51..2545eaf998 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringSubEntity.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/domain/OneFilteringSubEntity.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.e2e.entity.filtering.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import org.glassfish.jersey.tests.e2e.entity.filtering.PrimaryDetailedView; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/json/MoxyEntityFilteringTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/json/MoxyEntityFilteringTest.java index cad10e5c58..4219db4b92 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/json/MoxyEntityFilteringTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/json/MoxyEntityFilteringTest.java @@ -21,9 +21,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Application; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.message.filtering.EntityFilteringFeature; import org.glassfish.jersey.server.ResourceConfig; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/AbstractJsonTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/AbstractJsonTest.java index e8b771cb9f..e73684fac5 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/AbstractJsonTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/AbstractJsonTest.java @@ -34,7 +34,7 @@ import jakarta.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.Provider; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.internal.util.JdkVersion; @@ -218,7 +218,7 @@ private static boolean runningOnJdk7AndLater() { private static boolean moxyJaxbProvider() { return "org.eclipse.persistence.jaxb.JAXBContextFactory".equals( - AccessController.doPrivileged(PropertiesHelper.getSystemProperty("javax.xml.bind.JAXBContext"))); + AccessController.doPrivileged(PropertiesHelper.getSystemProperty("jakarta.xml.bind.JAXBContext"))); } /** diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java index e6709d6952..97aaf33ec9 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java @@ -27,7 +27,7 @@ import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.Response; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.jackson.JacksonFeature; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Animal.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Animal.java index ab8afdc84d..ee84c3d0d3 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Animal.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Animal.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnimalList.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnimalList.java index f60393952d..abfa9bc2f8 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnimalList.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnimalList.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherAnimal.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherAnimal.java index bdf1724482..fed6a2d6a0 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherAnimal.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherAnimal.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherArrayTestBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherArrayTestBean.java index 6daa66024a..1427e21069 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherArrayTestBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherArrayTestBean.java @@ -22,9 +22,9 @@ import javax.json.bind.annotation.JsonbTransient; import javax.json.bind.annotation.JsonbVisibility; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherCat.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherCat.java index 5c44ed337e..abe034fdda 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherCat.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AnotherCat.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AttrAndCharDataBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AttrAndCharDataBean.java index a4d12b7bd8..6ed0daa125 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AttrAndCharDataBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/AttrAndCharDataBean.java @@ -18,9 +18,9 @@ import java.util.Formatter; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Cat.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Cat.java index 80156da301..74c0b90658 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Cat.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Cat.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ColorHolder.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ColorHolder.java index b9e5cfd6ec..17ce645b82 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ColorHolder.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ColorHolder.java @@ -19,7 +19,7 @@ import java.util.Formatter; import java.util.Set; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes.java index 4ee88f15c1..d59ebce95b 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes.java @@ -21,9 +21,9 @@ import java.util.List; import javax.json.bind.annotation.JsonbVisibility; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes2.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes2.java index ecdb2e509c..4840b8adc9 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes2.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes2.java @@ -20,9 +20,9 @@ import java.util.List; import javax.json.bind.annotation.JsonbVisibility; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes3.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes3.java index 015a905b9e..4fb4628c56 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes3.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes3.java @@ -17,8 +17,8 @@ package org.glassfish.jersey.tests.e2e.json.entity; import javax.json.bind.annotation.JsonbVisibility; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes4.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes4.java index 6e674d5538..0a7e50b715 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes4.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ComplexBeanWithAttributes4.java @@ -21,9 +21,9 @@ import java.util.List; import javax.json.bind.annotation.JsonbVisibility; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Dog.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Dog.java index 57c7ddd5e1..43358d20d3 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Dog.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Dog.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementBean.java index 8646e6cf58..f4596c879b 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementBean.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementContainingBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementContainingBean.java index 2f62263ec2..b234e0ff6f 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementContainingBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EmptyElementContainingBean.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EncodedContentBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EncodedContentBean.java index 49802861e3..f24a4b6f59 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EncodedContentBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/EncodedContentBean.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/FakeArrayBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/FakeArrayBean.java index a76ab5a74b..1153c1ea1f 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/FakeArrayBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/FakeArrayBean.java @@ -20,11 +20,11 @@ import java.util.List; import javax.json.bind.annotation.JsonbVisibility; -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; /** * Test case for issue#310. diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/IntArray.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/IntArray.java index e56ebcd0f3..0caa0d564f 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/IntArray.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/IntArray.java @@ -18,7 +18,7 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Jersey1199List.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Jersey1199List.java index f2936257ed..139121fa9d 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Jersey1199List.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Jersey1199List.java @@ -21,7 +21,7 @@ import java.util.Formatter; import javax.json.bind.annotation.JsonbTypeAdapter; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.Jersey1199Test; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListAndNonListBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListAndNonListBean.java index 1d63367dd3..ed75031970 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListAndNonListBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListAndNonListBean.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListEmptyBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListEmptyBean.java index 4ff613bd9d..93178c8ad2 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListEmptyBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListEmptyBean.java @@ -20,7 +20,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListWrapperBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListWrapperBean.java index fdb96fd75b..d307e0adcf 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListWrapperBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/ListWrapperBean.java @@ -18,7 +18,7 @@ import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyError.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyError.java index 88977ccd5a..c1871ab73a 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyError.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyError.java @@ -16,11 +16,11 @@ package org.glassfish.jersey.tests.e2e.json.entity; -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; /** *

    Java class for anonymous complex type. diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyMessage.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyMessage.java index 0716cad727..19aea5d122 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyMessage.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyMessage.java @@ -16,11 +16,11 @@ package org.glassfish.jersey.tests.e2e.json.entity; -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; /** *

    Java class for anonymous complex type. diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyResponse.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyResponse.java index 1e6d6b2e27..3dd84bc5a9 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyResponse.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/MyResponse.java @@ -20,11 +20,11 @@ import java.util.List; import javax.json.bind.annotation.JsonbVisibility; -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; /** *

    Java class for anonymous complex type. diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBean.java index 703b58b856..b8d5c4e98b 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBean.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBeanWithAttribute.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBeanWithAttribute.java index bc948a18b0..36b9611b05 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBeanWithAttribute.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NamespaceBeanWithAttribute.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NullStringBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NullStringBean.java index 78919b623c..1f27876348 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NullStringBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/NullStringBean.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Person.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Person.java index f57887425a..0bee416a5d 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Person.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Person.java @@ -18,12 +18,12 @@ import java.util.Arrays; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -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.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/PureCharDataBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/PureCharDataBean.java index 15578a3677..18ef74c812 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/PureCharDataBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/PureCharDataBean.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/RegisterMessage.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/RegisterMessage.java index 68b53303f1..5921bf8ecc 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/RegisterMessage.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/RegisterMessage.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.tests.e2e.json.entity; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author David Kaspar diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBean.java index 613f29b72f..6c33acabf4 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBean.java @@ -18,8 +18,8 @@ import java.util.Formatter; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithAttributes.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithAttributes.java index 2d31414402..65d0463466 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithAttributes.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithAttributes.java @@ -22,8 +22,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttribute.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttribute.java index 5f8e6df47d..9ab23dc633 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttribute.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttribute.java @@ -21,8 +21,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttributeAndValue.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttributeAndValue.java index ac435a4f62..c19b7f35b2 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttributeAndValue.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithJustOneAttributeAndValue.java @@ -21,9 +21,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithObjectAttributes.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithObjectAttributes.java index bc10df1d69..b8e724d7eb 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithObjectAttributes.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleBeanWithObjectAttributes.java @@ -19,8 +19,8 @@ import java.net.URI; import java.util.Formatter; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Michal Gajdos diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleXmlTypeBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleXmlTypeBean.java index 0742e64c10..b7338efa56 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleXmlTypeBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SimpleXmlTypeBean.java @@ -18,8 +18,8 @@ import java.util.Formatter; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SingleItemListWrapperBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SingleItemListWrapperBean.java index 40763a4e33..143d50bf0e 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SingleItemListWrapperBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/SingleItemListWrapperBean.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TreeModel.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TreeModel.java index 4c318662c0..033d3849ae 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TreeModel.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TreeModel.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TwoListsWrapperBean.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TwoListsWrapperBean.java index 4dcb8c1d3f..01c7138e2b 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TwoListsWrapperBean.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/TwoListsWrapperBean.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/User.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/User.java index 12fef69321..4ea4b74817 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/User.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/User.java @@ -17,9 +17,9 @@ package org.glassfish.jersey.tests.e2e.json.entity; import javax.json.bind.annotation.JsonbTransient; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @author Jakub Podlesak diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/UserTable.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/UserTable.java index 57d492f066..9f5ca5a088 100644 --- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/UserTable.java +++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/UserTable.java @@ -20,9 +20,9 @@ import java.util.LinkedList; import java.util.List; -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; import org.glassfish.jersey.tests.e2e.json.JsonTestHelper; @@ -33,7 +33,7 @@ * unmarshalling XML/JSON stream additional elements are added to this list - MOXy doesn't override the existing list with a * new one created during unmarshalling). *

    - * Workaround: Set {@link javax.xml.bind.annotation.XmlAccessorType} to {@link javax.xml.bind.annotation.XmlAccessType#FIELD}, + * Workaround: Set {@link jakarta.xml.bind.annotation.XmlAccessorType} to {@link jakarta.xml.bind.annotation.XmlAccessType#FIELD}, * do not initialize the list in the default constructor * (field initializer) and assign the value to the list that should contain predefined values manually (in this case the value * object is represented by {@code #DEFAULT_HEADERS}). diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ContentNegotiationTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ContentNegotiationTest.java index ec6fb7f8cf..43863424dc 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ContentNegotiationTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ContentNegotiationTest.java @@ -24,7 +24,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.internal.HttpUrlConnector; diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/EntityExpansionTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/EntityExpansionTest.java index 24ac76ed86..8f8a4056bb 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/EntityExpansionTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/EntityExpansionTest.java @@ -27,11 +27,11 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ExceptionMapper; -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 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 javax.xml.parsers.SAXParserFactory; import org.glassfish.jersey.internal.util.SaxHelper; diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ResourceConfigTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ResourceConfigTest.java index 2db348f797..6ded31f3e1 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ResourceConfigTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/ResourceConfigTest.java @@ -24,7 +24,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.client.Entity; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.jettison.JettisonFeature; diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/TemplateMethodSelectionTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/TemplateMethodSelectionTest.java index c4c8fbbc44..dfd6ee5291 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/TemplateMethodSelectionTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/TemplateMethodSelectionTest.java @@ -26,7 +26,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.logging.LoggingFeature; diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/CustomBean.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/CustomBean.java index fba9532ae4..2b8fd9ece6 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/CustomBean.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/CustomBean.java @@ -17,8 +17,8 @@ package org.glassfish.jersey.tests.e2e.server.validation; import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * @author Michal Gajdos diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/validateonexecution/AnotherContactBean.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/validateonexecution/AnotherContactBean.java index 451b7911bd..b5cbcfacdd 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/validateonexecution/AnotherContactBean.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/validateonexecution/AnotherContactBean.java @@ -22,7 +22,7 @@ import javax.validation.constraints.Pattern; import javax.validation.executable.ExecutableType; import javax.validation.executable.ValidateOnExecution; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.tests.e2e.server.validation.Extended; diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/WadlResourceTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/WadlResourceTest.java index c1dda0be28..4c1239e19d 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/WadlResourceTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/WadlResourceTest.java @@ -55,7 +55,7 @@ import javax.inject.Named; import javax.xml.XMLConstants; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/NoEntityTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/NoEntityTest.java index c24abca246..d7a7693c34 100644 --- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/NoEntityTest.java +++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/NoEntityTest.java @@ -25,8 +25,8 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.logging.LoggingFeature; diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/oauth/OAuth2Test.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/oauth/OAuth2Test.java index 4081a34856..26138fc7cd 100644 --- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/oauth/OAuth2Test.java +++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/oauth/OAuth2Test.java @@ -38,8 +38,8 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.oauth2.ClientIdentifier; import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport; diff --git a/tests/integration/jersey-2892/src/main/java/org/glassfish/jersey/tests/integration/jersey2892/TestResource.java b/tests/integration/jersey-2892/src/main/java/org/glassfish/jersey/tests/integration/jersey2892/TestResource.java index fab20fcb11..471625d683 100644 --- a/tests/integration/jersey-2892/src/main/java/org/glassfish/jersey/tests/integration/jersey2892/TestResource.java +++ b/tests/integration/jersey-2892/src/main/java/org/glassfish/jersey/tests/integration/jersey2892/TestResource.java @@ -21,7 +21,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; /** * A resource that provides a means to test whether repeating classes in object graph are correctly filtered out. diff --git a/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Book.java b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Book.java index 840175756b..6af146fe36 100644 --- a/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Book.java +++ b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Book.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.integration.servlet_25_mvc_1.resource; -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/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Bookstore.java b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Bookstore.java index 50e8a03d6c..272ec7435a 100644 --- a/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Bookstore.java +++ b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Bookstore.java @@ -28,9 +28,9 @@ import jakarta.ws.rs.core.Response; import javax.inject.Singleton; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Item.java b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Item.java index b03c7be751..d0c07b9922 100644 --- a/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Item.java +++ b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Item.java @@ -20,9 +20,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Book.java b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Book.java index 5b64e83566..46a1519f16 100644 --- a/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Book.java +++ b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Book.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.integration.servlet_25_mvc_2.resource; -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/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Bookstore.java b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Bookstore.java index 4939b829e7..05726cef12 100644 --- a/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Bookstore.java +++ b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Bookstore.java @@ -28,9 +28,9 @@ import jakarta.ws.rs.core.Response; import javax.inject.Singleton; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Item.java b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Item.java index f3724eaf87..4e0f8f3e71 100644 --- a/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Item.java +++ b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Item.java @@ -20,9 +20,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Book.java b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Book.java index 049a8f2b99..09e541aee8 100644 --- a/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Book.java +++ b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Book.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.integration.servlet_25_mvc_3.resource; -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/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Bookstore.java b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Bookstore.java index 11fe5952a7..d078f87b1b 100644 --- a/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Bookstore.java +++ b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Bookstore.java @@ -28,9 +28,9 @@ import jakarta.ws.rs.core.Response; import javax.inject.Singleton; -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; import org.glassfish.jersey.server.mvc.Template; diff --git a/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Item.java b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Item.java index 8f0c96d80b..e606cd39ae 100644 --- a/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Item.java +++ b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Item.java @@ -21,9 +21,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -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; import org.glassfish.jersey.server.mvc.Template; import org.glassfish.jersey.server.mvc.Viewable; diff --git a/tests/integration/servlet-3-chunked-io/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_chunked_io/Message.java b/tests/integration/servlet-3-chunked-io/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_chunked_io/Message.java index f19740ad6c..75194d5b2f 100644 --- a/tests/integration/servlet-3-chunked-io/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_chunked_io/Message.java +++ b/tests/integration/servlet-3-chunked-io/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_chunked_io/Message.java @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.integration.servlet_3_chunked_io; -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; /** * Message POJO. diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java index c7b6f20eb2..5ad96a9102 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java @@ -41,8 +41,8 @@ public static Option[] configuration() { options.addAll(Helper.getCommonOsgiOptions()); options.addAll(Helper.expandedList( - bootDelegationPackage("javax.xml.bind"), - bootDelegationPackage("javax.xml.bind.*"), + bootDelegationPackage("jakarta.xml.bind"), + bootDelegationPackage("jakarta.xml.bind.*"), // jersey-json dependencies mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-jettison").versionAsInProject(), mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(), diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java index 3e7796d25e..0f7eb6f968 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java @@ -45,8 +45,8 @@ public static Option[] configuration() { options.addAll(Helper.expandedList( // vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"), - bootDelegationPackage("javax.xml.bind"), - bootDelegationPackage("javax.xml.bind.*"), + bootDelegationPackage("jakarta.xml.bind"), + bootDelegationPackage("jakarta.xml.bind.*"), // validation bootDelegationPackage("javax.xml.parsers"), bootDelegationPackage("javax.xml.parsers.*"), diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonResource.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonResource.java index 167e7641e8..5f9c8fde04 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonResource.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonResource.java @@ -21,7 +21,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * @author Jakub Podlesak diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java index f7b62948d3..c8fce18857 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java @@ -31,7 +31,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.UriBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.glassfish.jersey.client.proxy.WebResourceFactory; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; @@ -70,8 +70,8 @@ public static Option[] configuration() { List