Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<!-- spring -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />

<!-- JAXRS providers -->
<bean id="jsonProvider" class="com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider" />
<bean id="jsonProvider" class="tools.jackson.jakarta.rs.json.JacksonJsonProvider" />
<bean id="multipartProvider" class="org.apache.cxf.jaxrs.provider.MultipartProvider" />
<bean id="originFilter" class="demo.jaxrs.openapi.server.ApiOriginFilter" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ under the License.
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<param-name>jaxrs.providers</param-name>
<param-value>
org.apache.cxf.jaxrs.provider.MultipartProvider,
com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider,
tools.jackson.jakarta.rs.json.JacksonJsonProvider,
demo.jaxrs.openapi.server.ApiOriginFilter
</param-value>
</init-param>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jackson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -43,9 +47,23 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.databind</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-jackson2</artifactId>
<version>${cxf.spring.boot.version}</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@
*/
package demo.jaxrs.sse;

import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;

import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;

import io.undertow.Handlers;
import io.undertow.Undertow;
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@
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;
import org.springframework.context.annotation.Bean;
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@
</jaxrs:server>

<bean id="statsRestService" class="demo.jaxrs.sse.StatsRestServiceImpl"/>
<bean id="jacksonJsonProvider" class="com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider"/>
<bean id="jacksonJsonProvider" class="tools.jackson.jakarta.rs.json.JacksonJsonProvider"/>
</beans>

Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<bean class="${package}.HelloWorld"/>
</jaxrs:serviceBeans>
<jaxrs:providers>
<bean class="com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider.JacksonJsonProvider"/>
<bean class="tools.jackson.jakarta.rs.json.JacksonJsonProvider"/>
</jaxrs:providers>
</jaxrs:server>
</beans>
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void testPing() throws Exception {
@Test
public void testJsonRoundtrip() throws Exception {
List<Object> 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);
Expand Down
27 changes: 16 additions & 11 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
<cxf.httpcomponents.core.version>4.4.16</cxf.httpcomponents.core.version>
<cxf.httpcomponents.client5.version>5.5.1</cxf.httpcomponents.client5.version>
<cxf.httpcomponents.core5.version>5.3.6</cxf.httpcomponents.core5.version>
<cxf.jackson.version>2.20.1</cxf.jackson.version>
<cxf.jackson.databind.version>2.20.1</cxf.jackson.databind.version>
<cxf.jackson.version>3.0.1</cxf.jackson.version>
<cxf.jackson.databind.version>3.0.1</cxf.jackson.databind.version>
<cxf.jackson.annotations.version>2.20</cxf.jackson.annotations.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.8.1</cxf.jaeger.version>
Expand Down Expand Up @@ -1580,7 +1580,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${cxf.jackson.version}</version>
<exclusions>
Expand All @@ -1591,12 +1591,12 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${cxf.jackson.databind.version}</version>
</dependency>
Expand All @@ -1606,30 +1606,35 @@
<version>${cxf.jackson.annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<groupId>tools.jackson.module</groupId>
<artifactId>jackson-module-jsonSchema</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.10</artifactId>
<groupId>tools.jackson.module</groupId>
<artifactId>jackson-module-scala_2.12</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-xml-provider</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-yaml-provider</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<groupId>tools.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>tools.jackson.module</groupId>
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<version>${cxf.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion services/sts/systests/advanced/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<version>${cxf.hazelcast.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</jaxws:properties>
</jaxws:endpoint>

<bean id="jsonProvider" class="com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider" />
<bean id="jsonProvider" class="tools.jackson.jakarta.rs.json.JacksonJsonProvider" />

<jaxrs:server id="stsRESTService"
depends-on="ClientAuthHttpsSettings"
Expand Down
2 changes: 1 addition & 1 deletion services/sts/systests/basic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<version>${cxf.hazelcast.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<ref bean="restSTS" />
</jaxrs:serviceBeans>
<jaxrs:providers>
<bean class="com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider" />
<bean class="tools.jackson.jakarta.rs.json.JacksonJsonProvider" />
</jaxrs:providers>
<jaxrs:extensionMappings>
<entry key="json" value="application/json;charset=UTF-8" />
Expand Down
2 changes: 1 addition & 1 deletion systests/cdi/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<artifactId>tomcat-jasper</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<groupId>tools.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
<dependency>
Expand Down
Loading