diff --git a/pom.xml b/pom.xml index 363090ea4951ffca45883ea5f7a714dd764550b9..88de950d50172f65a09fe9489174cd391a11ef85 100644 --- a/pom.xml +++ b/pom.xml @@ -403,12 +403,6 @@ jakarta.activation-api ${activation.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - org.glassfish.jersey.inject jersey-hk2 @@ -429,6 +423,11 @@ jersey-media-multipart ${jersey.version} + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + jakarta.servlet jakarta.servlet-api diff --git a/src/main/java/org/gitlab4j/api/GitLabApiClient.java b/src/main/java/org/gitlab4j/api/GitLabApiClient.java index 02bde15427ba2e490cb0e5b8fa9905c4727188af..509dc192a66a1ddc454269738a3bac065b3884e2 100755 --- a/src/main/java/org/gitlab4j/api/GitLabApiClient.java +++ b/src/main/java/org/gitlab4j/api/GitLabApiClient.java @@ -38,6 +38,7 @@ import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.JerseyClientBuilder; +import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.media.multipart.BodyPart; import org.glassfish.jersey.media.multipart.Boundary; import org.glassfish.jersey.media.multipart.FormDataMultiPart; @@ -244,6 +245,7 @@ public class GitLabApiClient implements AutoCloseable { clientConfig.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, true); clientConfig.register(JacksonJson.class); + clientConfig.register(JacksonFeature.class); clientConfig.register(MultiPartFeature.class); } @@ -778,6 +780,7 @@ public class GitLabApiClient implements AutoCloseable { // Register JacksonJson as the ObjectMapper provider. clientBuilder.register(JacksonJson.class); + clientBuilder.register(JacksonFeature.class); if (ignoreCertificateErrors) { clientBuilder.sslContext(openSslContext).hostnameVerifier(openHostnameVerifier); diff --git a/src/main/java/org/gitlab4j/api/utils/JacksonJson.java b/src/main/java/org/gitlab4j/api/utils/JacksonJson.java index f7ca438f6666bf4eb4d15f9c243ffebb83369010..264824af4087d30b0fc23ec868cc85b5ed5e0c72 100644 --- a/src/main/java/org/gitlab4j/api/utils/JacksonJson.java +++ b/src/main/java/org/gitlab4j/api/utils/JacksonJson.java @@ -16,6 +16,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.ContextResolver; import org.gitlab4j.api.models.User; +import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonGenerationException; @@ -37,7 +38,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.type.CollectionType; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; /** * Jackson JSON Configuration and utility class.