diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml index 83484a27f..b27a31d07 100644 --- a/libreplan-webapp/pom.xml +++ b/libreplan-webapp/pom.xml @@ -466,13 +466,13 @@ org.apache.cxf cxf-rt-frontend-jaxrs - - org.codehaus.jackson - jackson-jaxrs + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.module + jackson-module-jaxb-annotations diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java index bcea19b87..500eea053 100755 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraRESTClient.java @@ -26,10 +26,10 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import com.fasterxml.jackson.databind.DeserializationFeature; import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.client.WebClient; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.map.DeserializationConfig.Feature; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.libreplan.importers.jira.IssueDTO; import org.libreplan.importers.jira.SearchResultDTO; import org.libreplan.ws.cert.NaiveTrustProvider; @@ -131,12 +131,10 @@ public class JiraRESTClient { private static WebClient createClient(String url) { JacksonJaxbJsonProvider jacksonJaxbJsonProvider = new JacksonJaxbJsonProvider(); - jacksonJaxbJsonProvider.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, - false); + jacksonJaxbJsonProvider.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - return WebClient.create(url, - Collections.singletonList(jacksonJaxbJsonProvider)).accept( - mediaTypes); + return WebClient.create(url, + Collections.singletonList(jacksonJaxbJsonProvider)).accept(mediaTypes); } diff --git a/pom.xml b/pom.xml index 70c506212..c23ee1d5b 100644 --- a/pom.xml +++ b/pom.xml @@ -563,14 +563,14 @@ - org.codehaus.jackson - jackson-jaxrs - 1.9.9 + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.7.3 - org.codehaus.jackson - jackson-xc - 1.9.9 + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + 2.7.3