diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml index 0c9666ebf78..efd39a454bb 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml @@ -70,7 +70,7 @@ cxf-rt-rs-service-description-openapi-v3 - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java index c5540b669a8..b1fcbb84b1b 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java @@ -19,14 +19,13 @@ package demo.jaxrs.openapi.server; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.commons.lang3.StringUtils; import org.apache.cxf.jaxrs.openapi.OpenApiFeature; import org.apache.cxf.jaxrs.provider.MultipartProvider; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jetty.ee11.servlet.ServletHolder; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class Server { diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml index e781ffabb3f..bb1cf98e707 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml @@ -70,7 +70,7 @@ cxf-rt-rs-service-description-openapi-v3 - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/resources/context.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/resources/context.xml index db43b6482fa..0caa4396f2d 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/resources/context.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/resources/context.xml @@ -28,7 +28,7 @@ - + diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml index fc1b736d1dd..3f584dd38d6 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml @@ -59,7 +59,7 @@ under the License. cxf-rt-rs-service-description-openapi-v3 - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/webapp/WEB-INF/web.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/webapp/WEB-INF/web.xml index f0269e09e9d..f727aabe36b 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/webapp/WEB-INF/web.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/webapp/WEB-INF/web.xml @@ -38,7 +38,7 @@ jaxrs.providers org.apache.cxf.jaxrs.provider.MultipartProvider, - com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider, + tools.jackson.jakarta.rs.json.JacksonJsonProvider, demo.jaxrs.openapi.server.ApiOriginFilter diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml index febd3016fe6..810c16579ad 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml @@ -21,6 +21,10 @@ org.springframework.boot spring-boot-starter-logging + + org.springframework.boot + spring-boot-starter-jackson + @@ -43,9 +47,23 @@ com.google.code.gson gson + + com.fasterxml.jackson.core + * + + + com.fasterxml.jackson.databind + * + + + org.springframework.boot + spring-boot-jackson2 + ${cxf.spring.boot.version} + + com.google.code.gson gson diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml index e6b8e01da76..f211b4f2f2e 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml @@ -36,12 +36,12 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider - com.fasterxml.jackson.core + tools.jackson.core jackson-core diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml index 032a315e270..98b34b7d602 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml @@ -31,12 +31,12 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider - com.fasterxml.jackson.core + tools.jackson.core jackson-core diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java index fd317b28e50..f6a00e21bd9 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java +++ b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java @@ -23,8 +23,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.sse.InboundSseEvent; import jakarta.ws.rs.sse.SseEventSource; - -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public final class StatsClient { private StatsClient() { diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsServer.java index 275992d62bd..c5509be145c 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsServer.java +++ b/distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsServer.java @@ -18,8 +18,6 @@ */ package demo.jaxrs.sse; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import io.undertow.Handlers; @@ -27,6 +25,7 @@ import io.undertow.server.handlers.PathHandler; import io.undertow.servlet.api.DeploymentInfo; import io.undertow.servlet.api.DeploymentManager; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import static io.undertow.servlet.Servlets.defaultContainer; import static io.undertow.servlet.Servlets.deployment; diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml index 7a272b28318..79920985d0b 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml @@ -25,12 +25,12 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider - com.fasterxml.jackson.core + tools.jackson.core jackson-core diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java index 34fa10b29e0..58a8973de7e 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java +++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java @@ -21,8 +21,6 @@ import jakarta.inject.Inject; import jakarta.ws.rs.ext.RuntimeDelegate; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.bus.spring.SpringBus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; @@ -30,6 +28,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @Configuration @ComponentScan(basePackageClasses = StatsRestServiceImpl.class) diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml index e9b00337d08..a3bd7f51021 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml @@ -35,12 +35,12 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider - com.fasterxml.jackson.core + tools.jackson.core jackson-core diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml index 27f35cd81f4..5de1ccae52e 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml @@ -37,6 +37,5 @@ - + - diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml index fcfe49a0d0d..cc52db8dc05 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml @@ -200,7 +200,7 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java index 4f81d951508..cf695e29bf5 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/server/cxf/Server.java @@ -29,10 +29,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import demo.jaxrs.tracing.OpenTelemetrySetup; import io.opentelemetry.api.OpenTelemetry; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @EnableAutoConfiguration @SpringBootApplication diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml index 4ca8e41be3b..e3c67aa4e6e 100644 --- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml @@ -19,7 +19,7 @@ ${project.version} - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider ${cxf.jackson.version} diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml index ec55762e974..bbdfb0602d9 100644 --- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml +++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml @@ -13,7 +13,7 @@ - + diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java index 17d0113051f..48a783ff701 100644 --- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java +++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java @@ -33,7 +33,7 @@ public void testPing() throws Exception { @Test public void testJsonRoundtrip() throws Exception { List providers = new ArrayList<>(); - providers.add(new com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider()); + providers.add(new tools.jackson.jakarta.rs.json.JacksonJsonProvider()); JsonBean inputBean = new JsonBean(); inputBean.setVal1("Maple"); WebClient client = WebClient.create(endpointUrl + "/hello/jsonBean", providers); diff --git a/parent/pom.xml b/parent/pom.xml index 404b3225eb5..e3e678f73e1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -131,8 +131,8 @@ 4.4.16 5.5.1 5.3.6 - 2.20.1 - 2.20.1 + 3.0.1 + 3.0.1 2.20 3.9 1.8.1 @@ -1580,7 +1580,7 @@ - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider ${cxf.jackson.version} @@ -1591,12 +1591,12 @@ - com.fasterxml.jackson.core + tools.jackson.core jackson-core ${cxf.jackson.version} - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${cxf.jackson.databind.version} @@ -1606,30 +1606,35 @@ ${cxf.jackson.annotations.version} - com.fasterxml.jackson.module + tools.jackson.module jackson-module-jsonSchema ${cxf.jackson.version} - com.fasterxml.jackson.module - jackson-module-scala_2.10 + tools.jackson.module + jackson-module-scala_2.12 ${cxf.jackson.version} - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-xml-provider ${cxf.jackson.version} - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-yaml-provider ${cxf.jackson.version} - com.fasterxml.jackson.datatype + tools.jackson.datatype jackson-datatype-joda ${cxf.jackson.version} + + tools.jackson.module + jackson-module-jakarta-xmlbind-annotations + ${cxf.jackson.version} + org.yaml snakeyaml diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml index 72ccdee2bf9..e760888dbd3 100644 --- a/services/sts/systests/advanced/pom.xml +++ b/services/sts/systests/advanced/pom.xml @@ -144,7 +144,7 @@ ${cxf.hazelcast.version} - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider test diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml index 22cbb364746..955e454bf60 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml @@ -42,7 +42,7 @@ - + ${cxf.hazelcast.version} - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider test diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java index 0f19784f641..a2e52a636fc 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java @@ -29,8 +29,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.fasterxml.jackson.databind.ObjectMapper; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.xml.bind.JAXBElement; @@ -61,6 +59,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.processor.SAMLTokenProcessor; +import tools.jackson.databind.ObjectMapper; import static org.apache.cxf.ws.security.trust.STSUtils.WST_NS_05_12; import static org.junit.Assert.assertEquals; diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml index 210b8c06b12..e85618a0f36 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml @@ -140,7 +140,7 @@ - + diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml index 468b149a099..0e7611dbca0 100644 --- a/systests/cdi/base/pom.xml +++ b/systests/cdi/base/pom.xml @@ -79,7 +79,7 @@ tomcat-jasper - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java index 03c0383efb8..7ccbc15871e 100644 --- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java +++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiMultiAppTest.java @@ -22,12 +22,11 @@ import java.util.List; import java.util.UUID; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Test; diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java index 35d37e52b46..46411e1f996 100644 --- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java +++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/AbstractCdiSingleAppTest.java @@ -22,14 +22,13 @@ import java.util.List; import java.util.UUID; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.message.Message; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Test; diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java index fcdde9f2ccc..4849de42b41 100644 --- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java +++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java @@ -23,8 +23,6 @@ import java.util.LinkedHashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import org.apache.cxf.jaxrs.validation.JAXRSBeanValidationFeature; @@ -35,6 +33,7 @@ import org.apache.cxf.systests.cdi.base.RequestScopedBookStore; import org.apache.cxf.systests.cdi.base.bindings.LoggingFilter; import org.apache.cxf.systests.cdi.base.contract.BookStoreImpl; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @ApplicationPath("/v2") public class BookStoreCustomApplication extends Application { diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml index ef10810a6cc..6e7a4767096 100644 --- a/systests/cdi/cdi-owb/pom.xml +++ b/systests/cdi/cdi-owb/pom.xml @@ -132,7 +132,7 @@ junit - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java index 6a1368a322c..ab13cbd7648 100644 --- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java +++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreCustomApplication.java @@ -23,8 +23,6 @@ import java.util.LinkedHashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import org.apache.cxf.jaxrs.validation.JAXRSBeanValidationFeature; @@ -34,6 +32,7 @@ import org.apache.cxf.systests.cdi.base.RequestScopedBookStore; import org.apache.cxf.systests.cdi.base.bindings.LoggingFilter; import org.apache.cxf.systests.cdi.base.contract.BookStoreImpl; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @ApplicationPath("/v2") public class BookStoreCustomApplication extends Application { diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml index b56716caa85..7a5fda39db2 100644 --- a/systests/cdi/cdi-weld/pom.xml +++ b/systests/cdi/cdi-weld/pom.xml @@ -107,7 +107,7 @@ junit - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 2566d77423a..67046eacb49 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -409,7 +409,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java index 70c0903b58e..f629514a28e 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.GenericType; import jakarta.ws.rs.core.MediaType; import org.apache.cxf.BusFactory; @@ -40,6 +38,7 @@ import org.apache.cxf.jaxrs.provider.JAXBElementProvider; import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -80,7 +79,7 @@ public void testGetBook123() throws Exception { assertNotNull(in); assertEquals("Jackson output not correct", - "{\"class\":\"org.apache.cxf.systest.jaxrs.Book\",\"name\":\"CXF in Action\",\"id\":123}", + "{\"class\":\"org.apache.cxf.systest.jaxrs.Book\",\"id\":123,\"name\":\"CXF in Action\"}", getStringFromInputStream(in).trim()); } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java index 4feedaefec8..2540a529700 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java @@ -24,8 +24,6 @@ import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.Response; import org.apache.cxf.endpoint.Server; import org.apache.cxf.interceptor.Fault; @@ -40,6 +38,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.local.LocalConduit; import org.apache.cxf.transport.local.LocalTransportFactory; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.After; import org.junit.Before; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java index b53abaa7129..6855fc96ada 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java @@ -26,8 +26,6 @@ import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.cors.CorsHeaderConstants; @@ -43,6 +41,7 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpOptions; import org.apache.http.impl.client.HttpClientBuilder; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Before; import org.junit.BeforeClass; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java index 2d08cba439a..a7c9c120b0d 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -47,6 +45,7 @@ import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; import org.hamcrest.CoreMatchers; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.security.SecurityScheme.Type; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigApplicationOnlyTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigApplicationOnlyTest.java index 0f23beb21ae..6cef90a9ce2 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigApplicationOnlyTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigApplicationOnlyTest.java @@ -22,8 +22,6 @@ import java.util.Collections; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.MediaType; import org.apache.cxf.Bus; @@ -42,6 +40,7 @@ import org.apache.cxf.systest.jaxrs.description.group2.BookStore; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.swagger.v3.jaxrs2.integration.JaxrsApplicationScanner; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigTest.java index fb4e95a504c..c4448600739 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiContextBasedConfigTest.java @@ -21,8 +21,6 @@ import java.util.Arrays; import java.util.Collections; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; @@ -40,6 +38,7 @@ import org.apache.cxf.systest.jaxrs.description.group2.BookStore; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomizerTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomizerTest.java index e1333868057..650a7163a4e 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomizerTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiCustomizerTest.java @@ -21,19 +21,17 @@ import java.util.Arrays; import java.util.Collections; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ext.RuntimeDelegate; import org.apache.cxf.Bus; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.openapi.OpenApiCustomizer; import org.apache.cxf.jaxrs.openapi.OpenApiFeature; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; - public class OpenApiCustomizerTest extends AbstractOpenApiServiceDescriptionTest { private static final String PORT = allocatePort(OpenApiCustomizerTest.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiNonAnnotatedServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiNonAnnotatedServiceDescriptionTest.java index 95186903de7..428307366ad 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiNonAnnotatedServiceDescriptionTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiNonAnnotatedServiceDescriptionTest.java @@ -21,14 +21,13 @@ import java.util.Arrays; import java.util.Collections; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.openapi.OpenApiFeature; import org.apache.cxf.systest.jaxrs.description.group1.BookStore; import org.apache.cxf.systest.jaxrs.description.group1.BookStoreStylesheetsOpenApi; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationQueryConfigTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationQueryConfigTest.java index 5dd93d5afda..10ea5c1fae9 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationQueryConfigTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationQueryConfigTest.java @@ -20,8 +20,6 @@ import java.util.Arrays; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.cxf.Bus; @@ -33,6 +31,7 @@ import org.apache.cxf.jaxrs.swagger.ui.SwaggerUiConfig; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java index a2f4e449eef..9d143c961da 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/SwaggerUiConfigurationTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.cxf.Bus; @@ -36,6 +34,7 @@ import org.apache.cxf.jaxrs.swagger.ui.SwaggerUiOAuth2Config; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java index 06d8feba2a9..a883c43a9a8 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java @@ -24,8 +24,6 @@ import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import org.apache.cxf.Bus; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; @@ -43,6 +41,7 @@ import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; import org.apache.lucene.search.ScoreDoc; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Before; import org.junit.BeforeClass; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/logging/LoggingTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/logging/LoggingTest.java index 0d4567eb9d1..19b29221c42 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/logging/LoggingTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/logging/LoggingTest.java @@ -22,14 +22,13 @@ import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.systest.jaxrs.Book; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java index a46b632dd51..8cd75213919 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java @@ -21,7 +21,6 @@ import java.util.Arrays; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import com.github.tomakehurst.wiremock.junit.WireMockRule; import jakarta.ws.rs.NotFoundException; @@ -38,6 +37,7 @@ import org.apache.cxf.metrics.MetricsProvider; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.testutil.common.TestUtil; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Before; import org.junit.Rule; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSServerMetricsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSServerMetricsTest.java index 239e59e1ff1..e11c8da5ddd 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSServerMetricsTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSServerMetricsTest.java @@ -21,8 +21,6 @@ import java.util.Arrays; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.client.Client; @@ -42,6 +40,7 @@ import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Before; import org.junit.BeforeClass; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreTest.java index 01ecb997669..883b7f48029 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreTest.java @@ -23,14 +23,13 @@ import java.util.Arrays; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java index ac5a8d704b7..59a51c273b3 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.client.ClientBuilder; @@ -40,6 +38,7 @@ import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.Flowable; import io.reactivex.subscribers.TestSubscriber; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2MaybeTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2MaybeTest.java index d7171905584..18e09322c3c 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2MaybeTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2MaybeTest.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; @@ -31,6 +29,7 @@ import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.Flowable; import io.reactivex.subscribers.TestSubscriber; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java index 18955bd3394..3c3f980548e 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2ObservableTest.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.GenericType; @@ -39,6 +37,7 @@ import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvoker; import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2SingleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2SingleTest.java index ae0b49e849e..f9d30cf951c 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2SingleTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2SingleTest.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; @@ -30,6 +28,7 @@ import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.Flowable; import io.reactivex.subscribers.TestSubscriber; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3FlowableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3FlowableTest.java index 15a89dc7742..875d3aa0ca9 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3FlowableTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3FlowableTest.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.client.ClientBuilder; @@ -40,6 +38,7 @@ import org.apache.cxf.jaxrs.rx3.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx3.client.FlowableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.subscribers.TestSubscriber; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3MaybeTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3MaybeTest.java index 4fe15de9012..7a26ae5f1f0 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3MaybeTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3MaybeTest.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; @@ -31,6 +29,7 @@ import org.apache.cxf.jaxrs.rx3.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx3.client.FlowableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.subscribers.TestSubscriber; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3ObservableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3ObservableTest.java index b826cdc1dda..189c2d10f13 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3ObservableTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3ObservableTest.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.GenericType; @@ -39,6 +37,7 @@ import org.apache.cxf.jaxrs.rx3.client.ObservableRxInvoker; import org.apache.cxf.jaxrs.rx3.client.ObservableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.Disposable; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3SingleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3SingleTest.java index 3e9f0e2d86f..9a4e1321b31 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3SingleTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava3SingleTest.java @@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; @@ -30,6 +28,7 @@ import org.apache.cxf.jaxrs.rx3.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx3.client.FlowableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.subscribers.TestSubscriber; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJavaObservableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJavaObservableTest.java index 6e7e6b9b2e2..9330a0f62cf 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJavaObservableTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJavaObservableTest.java @@ -22,12 +22,11 @@ import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.GenericType; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableServer.java index d0d9365055e..f9b362c1754 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2FlowableServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -29,7 +27,7 @@ import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.rx2.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava2FlowableServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava2FlowableServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2MaybeServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2MaybeServer.java index a9522780501..dd9ca1c5524 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2MaybeServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2MaybeServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -29,7 +27,7 @@ import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.rx2.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava2MaybeServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava2MaybeServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2ObservableServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2ObservableServer.java index 702da0ecee3..3f66363fdc4 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2ObservableServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2ObservableServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -29,7 +27,7 @@ import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.rx2.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava2ObservableServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava2ObservableServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2SingleServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2SingleServer.java index 54e314646ac..247d16d91ac 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2SingleServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava2SingleServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -29,7 +27,7 @@ import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.rx2.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava2SingleServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava2SingleServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3FlowableServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3FlowableServer.java index ffecf78f3ab..89df21ec350 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3FlowableServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3FlowableServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -29,7 +27,7 @@ import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.rx3.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava3FlowableServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava3FlowableServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3MaybeServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3MaybeServer.java index 61f82571175..1a3820ebbdd 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3MaybeServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3MaybeServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -28,7 +26,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.rx3.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava3MaybeServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava3MaybeServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3ObservableServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3ObservableServer.java index 4bf6488f7c3..07bf700c396 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3ObservableServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3ObservableServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -28,7 +26,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.rx3.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava3ObservableServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava3ObservableServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3SingleServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3SingleServer.java index dfc9b648cd9..53051363050 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3SingleServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJava3SingleServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -28,7 +26,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.rx3.server.ReactiveIOCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJava3SingleServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJava3SingleServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaObservableServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaObservableServer.java index 0f15b6b4b10..7e4bbd92ac3 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaObservableServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/RxJavaObservableServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactive; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.ext.logging.LoggingOutInterceptor; @@ -28,7 +26,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.rx.server.ObservableCustomizer; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class RxJavaObservableServer extends AbstractServerTestServerBase { public static final String PORT = allocatePort(RxJavaObservableServer.class); diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java index f7dd6e1203a..44ce970aca2 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java @@ -21,8 +21,6 @@ import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.GenericType; import jakarta.ws.rs.core.MediaType; @@ -33,6 +31,7 @@ import org.apache.cxf.jaxrs.reactor.client.ReactorInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import reactor.test.StepVerifier; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java index 8e37863acfe..239038358b6 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactor; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; @@ -29,6 +27,7 @@ import org.apache.cxf.jaxrs.reactor.client.ReactorInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import reactor.test.StepVerifier; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Test; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java index 3bdf6e13c31..165cabbadb0 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.reactor; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; @@ -28,6 +26,7 @@ import org.apache.cxf.jaxrs.provider.ProviderFactory; import org.apache.cxf.jaxrs.reactor.server.ReactorCustomizer; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class ReactorServer extends AbstractBusTestServerBase { public static final String PORT = allocatePort(ReactorServer.class); diff --git a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml index 259fa7ce2c4..fe5902030d2 100644 --- a/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml @@ -149,7 +149,7 @@ - + @@ -245,7 +245,7 @@ - + diff --git a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml index 94b9249ce8c..74877c058e7 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml @@ -50,7 +50,7 @@ - + diff --git a/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml index 04e1489cef6..8864c4f3f74 100644 --- a/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml +++ b/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml @@ -123,8 +123,8 @@ http://cxf.apache.org/schemas/jaxrs.xsd"> - - + + diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml index 684bf3708e0..68e0c0299ff 100644 --- a/systests/kerberos/pom.xml +++ b/systests/kerberos/pom.xml @@ -214,7 +214,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/ldap/pom.xml b/systests/ldap/pom.xml index ac18274083a..2a239a6d30d 100644 --- a/systests/ldap/pom.xml +++ b/systests/ldap/pom.xml @@ -188,7 +188,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml index d4b197067a6..983c8f7fd4d 100644 --- a/systests/rs-http-sci/pom.xml +++ b/systests/rs-http-sci/pom.xml @@ -90,14 +90,18 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider + + tools.jackson.module + jackson-module-jakarta-xmlbind-annotations + org.apache.httpcomponents httpclient test - + org.asynchttpclient async-http-client diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java index a74e5d294c6..d7ebdecbda9 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java @@ -21,14 +21,13 @@ import java.util.Arrays; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.demo.resources.Book; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Test; diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java index e910816c225..298b824a793 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java @@ -19,13 +19,12 @@ package org.apache.cxf.jaxrs.servlet.jetty; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.servlet.AbstractSciTest; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java index ad18f45a96e..32cfd9db0c2 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java @@ -19,14 +19,13 @@ package org.apache.cxf.jaxrs.servlet.jetty; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.servlet.AbstractSciTest; import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java index 7e0c7c87646..f8902dd8696 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java @@ -19,14 +19,13 @@ package org.apache.cxf.jaxrs.servlet.jetty; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.servlet.AbstractSciTest; import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.ResourceFactory; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/systests/rs-http-sci/src/test/java/org/apache/demo/applications/classes/BookApplication.java b/systests/rs-http-sci/src/test/java/org/apache/demo/applications/classes/BookApplication.java index 13eccaede0c..2538a501172 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/demo/applications/classes/BookApplication.java +++ b/systests/rs-http-sci/src/test/java/org/apache/demo/applications/classes/BookApplication.java @@ -22,11 +22,11 @@ import java.util.HashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import org.apache.demo.resources.BookStore; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @ApplicationPath("/api") public class BookApplication extends Application { diff --git a/systests/rs-http-sci/src/test/java/org/apache/demo/applications/complete/BookApplication.java b/systests/rs-http-sci/src/test/java/org/apache/demo/applications/complete/BookApplication.java index 3f09ec9b1c3..78326fdd9b1 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/demo/applications/complete/BookApplication.java +++ b/systests/rs-http-sci/src/test/java/org/apache/demo/applications/complete/BookApplication.java @@ -22,11 +22,10 @@ import java.util.HashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import org.apache.demo.resources.BookStore; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @ApplicationPath("/api") public class BookApplication extends Application { diff --git a/systests/rs-http-sci/src/test/java/org/apache/demo/applications/singletons/BookApplication.java b/systests/rs-http-sci/src/test/java/org/apache/demo/applications/singletons/BookApplication.java index 8c46fe9dd7c..0c2ce0a8fb8 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/demo/applications/singletons/BookApplication.java +++ b/systests/rs-http-sci/src/test/java/org/apache/demo/applications/singletons/BookApplication.java @@ -22,11 +22,11 @@ import java.util.HashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import org.apache.demo.resources.BookStore; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @ApplicationPath("/api") public class BookApplication extends Application { diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml index bbc72341a04..adb1599481c 100644 --- a/systests/rs-security/pom.xml +++ b/systests/rs-security/pom.xml @@ -171,7 +171,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml index 31d7acc5a33..7247d94a4f1 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml @@ -64,7 +64,7 @@ under the License. - + diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml index e612970be4a..da27918a5eb 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-serverJwt.xml @@ -64,7 +64,7 @@ under the License. - + diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml index e4b378a96cf..17d489b54e4 100644 --- a/systests/rs-sse/rs-sse-base/pom.xml +++ b/systests/rs-sse/rs-sse-base/pom.xml @@ -46,7 +46,7 @@ compile - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseBaseTest.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseBaseTest.java index b74f51401c5..c672a1c43a3 100644 --- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseBaseTest.java +++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseBaseTest.java @@ -22,20 +22,19 @@ import java.util.Collection; import java.util.List; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public abstract class AbstractSseBaseTest extends AbstractBusClientServerTestBase { private final ObjectMapper mapper = new ObjectMapper(); - protected String toJson(final String name, final Integer id) throws JsonProcessingException { + protected String toJson(final String name, final Integer id) throws JacksonException { return mapper.writeValueAsString(new Book(name, id)); } diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java index 34057527448..cc969aeaf9e 100644 --- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java +++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java @@ -33,9 +33,6 @@ import java.util.function.Consumer; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; @@ -46,6 +43,8 @@ import jakarta.ws.rs.sse.InboundSseEvent; import jakarta.ws.rs.sse.SseEventSource; import jakarta.ws.rs.sse.SseEventSource.Builder; +import tools.jackson.core.JacksonException; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.Before; import org.junit.Test; @@ -299,7 +298,7 @@ public void testBooksStreamIsBroadcasted() throws Exception { } @Test - public void testBooksAreReturned() throws JsonProcessingException { + public void testBooksAreReturned() throws JacksonException { Response r = createWebClient("/rest/api/bookstore", MediaType.APPLICATION_JSON).get(); assertEquals(Status.OK.getStatusCode(), r.getStatus()); diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/SseApplication.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/SseApplication.java index bf564e3ab40..4dcfbe4c61e 100644 --- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/SseApplication.java +++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/SseApplication.java @@ -23,9 +23,8 @@ import java.util.HashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.core.Application; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class SseApplication extends Application { @Override diff --git a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java index c6fea311396..3db75ac8f81 100644 --- a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java +++ b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java @@ -19,8 +19,6 @@ package org.apache.cxf.systest.jaxrs.sse.jetty; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.apache.cxf.systest.jaxrs.sse.BookStore; import org.apache.cxf.systest.jaxrs.sse.BookStoreResponseFilter; @@ -32,7 +30,7 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.util.resource.ResourceFactory; - +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import static org.junit.Assert.fail; diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java index bc5cdb6be2e..3b6c9b950f5 100644 --- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java +++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java @@ -22,8 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.catalina.Context; import org.apache.catalina.Wrapper; import org.apache.catalina.startup.Tomcat; @@ -32,6 +30,7 @@ import org.apache.cxf.systest.jaxrs.sse.BookStore; import org.apache.cxf.systest.jaxrs.sse.BookStoreResponseFilter; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import static org.junit.Assert.fail; diff --git a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java index 6185bbd3e0d..5d27b2d127e 100644 --- a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java +++ b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java @@ -19,12 +19,11 @@ package org.apache.cxf.systest.jaxrs.sse.undertow; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.apache.cxf.systest.jaxrs.sse.BookStore; import org.apache.cxf.systest.jaxrs.sse.BookStoreResponseFilter; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.undertow.Handlers; import io.undertow.Undertow; diff --git a/systests/spring-boot/pom.xml b/systests/spring-boot/pom.xml index 7d245308d88..7ecd04338f8 100644 --- a/systests/spring-boot/pom.xml +++ b/systests/spring-boot/pom.xml @@ -91,7 +91,7 @@ cxf-rt-rs-service-description-openapi-v3 - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/applications/LibraryApplication.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/applications/LibraryApplication.java index afbff7eddbe..7e839d4d155 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/applications/LibraryApplication.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/applications/LibraryApplication.java @@ -23,11 +23,10 @@ import java.util.HashSet; import java.util.Set; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ApplicationPath; import jakarta.ws.rs.core.Application; import org.apache.cxf.systest.jaxrs.resources.Library; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; @ApplicationPath("app") public class LibraryApplication extends Application { diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringClientOnlyJaxrsTest.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringClientOnlyJaxrsTest.java index d901468e52a..3a320dfbac7 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringClientOnlyJaxrsTest.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringClientOnlyJaxrsTest.java @@ -21,8 +21,6 @@ import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.Invocation.Builder; @@ -44,6 +42,7 @@ import org.springframework.web.servlet.function.RouterFunction; import org.springframework.web.servlet.function.RouterFunctions; import org.springframework.web.servlet.function.ServerResponse; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java index 880d4354579..cd633718bc3 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsApplicationTest.java @@ -23,8 +23,6 @@ import java.util.Arrays; import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.ProcessingException; @@ -48,6 +46,7 @@ import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.test.context.ActiveProfiles; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsObservabilityTest.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsObservabilityTest.java index e688bdde4c8..264278bbbc9 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsObservabilityTest.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsObservabilityTest.java @@ -21,8 +21,6 @@ import java.time.Duration; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import brave.handler.SpanHandler; import brave.sampler.Sampler; import jakarta.ws.rs.client.ClientBuilder; @@ -45,6 +43,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.test.context.ActiveProfiles; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java index 1c3cb0ece66..f7617f3a1b4 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java @@ -23,8 +23,6 @@ import java.util.Arrays; import java.util.Map; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.ProcessingException; @@ -51,6 +49,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.test.context.ActiveProfiles; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsWebObservabilityTest.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsWebObservabilityTest.java index 5b12b532d34..ba00bad387f 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsWebObservabilityTest.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsWebObservabilityTest.java @@ -21,8 +21,6 @@ import java.time.Duration; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import brave.handler.SpanHandler; import brave.sampler.Sampler; import jakarta.ws.rs.client.ClientBuilder; @@ -44,6 +42,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.test.context.ActiveProfiles; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tags; diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringSseEmitterTest.java b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringSseEmitterTest.java index 721b3b285cb..ed9537e516d 100644 --- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringSseEmitterTest.java +++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringSseEmitterTest.java @@ -24,8 +24,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.sse.SseEventSource; @@ -39,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter.SseEventBuilder; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.jupiter.api.Test; diff --git a/systests/tracing/pom.xml b/systests/tracing/pom.xml index 8186299f4c2..57d32af8d5d 100644 --- a/systests/tracing/pom.xml +++ b/systests/tracing/pom.xml @@ -133,7 +133,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java index a757727a5ce..f402b0a71ca 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java @@ -18,8 +18,6 @@ */ package org.apache.cxf.systest.jaxrs.tracing.brave; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import brave.Tracing; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; @@ -33,6 +31,7 @@ import org.apache.cxf.tracing.brave.TraceScope; import org.apache.cxf.tracing.brave.jaxrs.BraveClientProvider; import org.apache.cxf.tracing.brave.jaxrs.BraveFeature; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.junit.BeforeClass; diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java index e682f4fa90c..2a668deb89c 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java @@ -18,8 +18,6 @@ */ package org.apache.cxf.systest.jaxrs.tracing.micrometer; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import brave.Tracing; import org.apache.cxf.feature.Feature; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; @@ -40,6 +38,7 @@ import org.apache.cxf.tracing.micrometer.jaxrs.DefaultContainerRequestSenderObservationConvention; import org.apache.cxf.tracing.micrometer.jaxrs.ObservationClientProvider; import org.apache.cxf.tracing.micrometer.jaxrs.ObservationFeature; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.micrometer.common.KeyValue; import io.micrometer.common.KeyValues; diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java index dde899d4e2f..280bf80996b 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java @@ -32,8 +32,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.IntStream; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -50,6 +48,7 @@ import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryClientProvider; import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryFeature; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.Span; diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java index d8be95bbd6e..7b816cf4ffd 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java @@ -34,8 +34,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.IntStream; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -52,6 +50,7 @@ import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingClientProvider; import org.apache.cxf.tracing.opentracing.jaxrs.OpenTracingFeature; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import io.jaegertracing.internal.JaegerSpan; import io.jaegertracing.internal.JaegerSpanContext; diff --git a/systests/transport-hc5/pom.xml b/systests/transport-hc5/pom.xml index 0c6312a4edb..f3fc9b675c3 100644 --- a/systests/transport-hc5/pom.xml +++ b/systests/transport-hc5/pom.xml @@ -158,7 +158,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider test diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java index 481e9dbe178..1420af446e9 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java @@ -25,8 +25,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Produces; import jakarta.ws.rs.WebApplicationException; @@ -41,6 +39,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.provider.StreamingResponseProvider; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class BookServerAsyncClient extends AbstractServerTestServerBase { public static final String PORT = allocatePort(BookServerAsyncClient.class); diff --git a/systests/transport-netty/pom.xml b/systests/transport-netty/pom.xml index 1b6fb375170..88638dd214f 100644 --- a/systests/transport-netty/pom.xml +++ b/systests/transport-netty/pom.xml @@ -123,7 +123,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider test diff --git a/systests/transport-undertow/pom.xml b/systests/transport-undertow/pom.xml index 5724e958e86..fab6f8a9720 100644 --- a/systests/transport-undertow/pom.xml +++ b/systests/transport-undertow/pom.xml @@ -160,7 +160,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index 70e622f54b2..eb2e17f27b2 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -403,7 +403,7 @@ test - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider test diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/hc/jaxrs/BookServerAsyncClient.java b/systests/transports/src/test/java/org/apache/cxf/systest/hc/jaxrs/BookServerAsyncClient.java index 2e7610166d8..ff701ac5ca4 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/hc/jaxrs/BookServerAsyncClient.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/hc/jaxrs/BookServerAsyncClient.java @@ -25,8 +25,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Produces; import jakarta.ws.rs.WebApplicationException; @@ -41,6 +39,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.provider.StreamingResponseProvider; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class BookServerAsyncClient extends AbstractServerTestServerBase { public static final String PORT = allocatePort(BookServerAsyncClient.class);