Skip to content

Commit 1761d39

Browse files
committed
CXF-9169: Update to Jackson 3.0.0
1 parent 3fd2523 commit 1761d39

File tree

112 files changed

+161
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+161
-215
lines changed

distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
7171
</dependency>
7272
<dependency>
73-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
73+
<groupId>tools.jackson.jakarta.rs</groupId>
7474
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
7575
</dependency>
7676
<dependency>

distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919

2020
package demo.jaxrs.openapi.server;
2121

22-
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
23-
2422
import org.apache.commons.lang3.StringUtils;
2523
import org.apache.cxf.jaxrs.openapi.OpenApiFeature;
2624
import org.apache.cxf.jaxrs.provider.MultipartProvider;
2725
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
2826
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
2927
import org.eclipse.jetty.ee11.servlet.ServletHolder;
28+
import tools.jackson.jakarta.rs.json.JacksonJsonProvider;
3029

3130
public class Server {
3231

distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
7171
</dependency>
7272
<dependency>
73-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
73+
<groupId>tools.jackson.jakarta.rs</groupId>
7474
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
7575
</dependency>
7676
<!-- spring -->

distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/src/main/resources/context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<import resource="classpath:META-INF/cxf/cxf.xml" />
2929

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

distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ under the License.
5959
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
6060
</dependency>
6161
<dependency>
62-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
62+
<groupId>tools.jackson.jakarta.rs</groupId>
6363
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
6464
</dependency>
6565
</dependencies>

distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/src/main/webapp/WEB-INF/web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<param-name>jaxrs.providers</param-name>
3939
<param-value>
4040
org.apache.cxf.jaxrs.provider.MultipartProvider,
41-
com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider,
41+
tools.jackson.jakarta.rs.json.JacksonJsonProvider,
4242
demo.jaxrs.openapi.server.ApiOriginFilter
4343
</param-value>
4444
</init-param>

distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-logging</artifactId>
2323
</exclusion>
24+
<exclusion>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-starter-jackson</artifactId>
27+
</exclusion>
2428
</exclusions>
2529
</dependency>
2630
<dependency>
@@ -43,9 +47,23 @@
4347
<groupId>com.google.code.gson</groupId>
4448
<artifactId>gson</artifactId>
4549
</exclusion>
50+
<exclusion>
51+
<groupId>com.fasterxml.jackson.core</groupId>
52+
<artifactId>*</artifactId>
53+
</exclusion>
54+
<exclusion>
55+
<groupId>com.fasterxml.jackson.databind</groupId>
56+
<artifactId>*</artifactId>
57+
</exclusion>
4658
</exclusions>
4759
</dependency>
4860

61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-jackson2</artifactId>
64+
<version>${cxf.spring.boot.version}</version>
65+
</dependency>
66+
4967
<dependency>
5068
<groupId>com.google.code.gson</groupId>
5169
<artifactId>gson</artifactId>

distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
</dependency>
3737

3838
<dependency>
39-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
39+
<groupId>tools.jackson.jakarta.rs</groupId>
4040
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
4141
</dependency>
4242

4343
<dependency>
44-
<groupId>com.fasterxml.jackson.core</groupId>
44+
<groupId>tools.jackson.core</groupId>
4545
<artifactId>jackson-core</artifactId>
4646
</dependency>
4747

distribution/src/main/release/samples/jax_rs/sse_client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
</dependency>
3232

3333
<dependency>
34-
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
34+
<groupId>tools.jackson.jakarta.rs</groupId>
3535
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
3636
</dependency>
3737

3838
<dependency>
39-
<groupId>com.fasterxml.jackson.core</groupId>
39+
<groupId>tools.jackson.core</groupId>
4040
<artifactId>jackson-core</artifactId>
4141
</dependency>
4242

distribution/src/main/release/samples/jax_rs/sse_client/src/main/java/demo/jaxrs/sse/StatsClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
import jakarta.ws.rs.core.MediaType;
2424
import jakarta.ws.rs.sse.InboundSseEvent;
2525
import jakarta.ws.rs.sse.SseEventSource;
26-
27-
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
26+
import tools.jackson.jakarta.rs.json.JacksonJsonProvider;
2827

2928
public final class StatsClient {
3029
private StatsClient() {

0 commit comments

Comments
 (0)