From 4f4c9a059986ac218a96d2ce7a019598d04a261d Mon Sep 17 00:00:00 2001
From: Bogdan Bodnarjuk <bogdan@libreplan-enterprise.com>
Date: Tue, 26 Apr 2016 17:32:57 +0300
Subject: [PATCH] Update Jackson lib, change repo for lib

(cherry picked from commit c80fb43bbb1c41e5104a967d2a0c89028ebf4920)
---
 libreplan-webapp/pom.xml                             |  8 ++++----
 .../java/org/libreplan/importers/JiraRESTClient.java | 12 +++++-------
 pom.xml                                              | 12 ++++++------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml
index 849d8497d..3a008e1c0 100644
--- a/libreplan-webapp/pom.xml
+++ b/libreplan-webapp/pom.xml
@@ -466,12 +466,12 @@
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         </dependency>
          <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-xc</artifactId>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
 
         <!-- ZK Timeplot -->
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 70158b6cd..baf714e67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,14 +563,14 @@
 
             <!-- jackson provider -->
             <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-jaxrs</artifactId>
-                <version>1.9.9</version>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-json-provider</artifactId>
+                <version>2.7.3</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-xc</artifactId>
-                <version>1.9.9</version>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-jaxb-annotations</artifactId>
+                <version>2.7.3</version>
             </dependency>
 
             <!-- ZK Timeplot -->