From 5d7c93db3610fb9f2a7c7541459dab7a17612713 Mon Sep 17 00:00:00 2001 From: Luis Lainez Date: Fri, 26 Apr 2024 15:17:39 +1000 Subject: [PATCH] Upgrade Jackson to jakarta namespace --- client/build.gradle | 5 +++-- .../netflix/conductor/client/http/ClientRequestHandler.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/build.gradle b/client/build.gradle index 39dc9ed9e..9ff472eab 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -29,8 +29,9 @@ dependencies { } implementation "com.amazonaws:aws-java-sdk-core:${revAwsSdk}" - implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" + implementation 'com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.17.0' + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0" +// implementation 'javax.xml.ws:jaxws-api:2.3.1' //Needed for jackson-jaxrs-json-provider implementation "org.apache.commons:commons-lang3" implementation "commons-io:commons-io:${revCommonsIo}" diff --git a/client/src/main/java/com/netflix/conductor/client/http/ClientRequestHandler.java b/client/src/main/java/com/netflix/conductor/client/http/ClientRequestHandler.java index a04fd2065..aa4824d18 100644 --- a/client/src/main/java/com/netflix/conductor/client/http/ClientRequestHandler.java +++ b/client/src/main/java/com/netflix/conductor/client/http/ClientRequestHandler.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientRequestFilter;