From 8fb9958ec6465950b6c317508a688c52ad9e5e45 Mon Sep 17 00:00:00 2001
From: Bill Branan <bill.branan@lyrasis.org>
Date: Thu, 2 Apr 2020 13:08:39 -0400
Subject: [PATCH] Updates jackson dependency version (#31)

Resolves https://jira.lyrasis.org/browse/DURACLOUD-1261
---
 common-dup/pom.xml                            | 12 ++++++------
 .../duracloud/mill/dup/DuplicationPolicy.java |  4 ++--
 .../mill/dup/DuplicationPolicyManager.java    |  4 ++--
 common/pom.xml                                | 15 ---------------
 loopingtaskproducer/pom.xml                   |  5 +++++
 .../org/duracloud/mill/ltp/StateManager.java  |  4 ++--
 pom.xml                                       | 19 ++++++++++---------
 7 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/common-dup/pom.xml b/common-dup/pom.xml
index ac40056d..a496f1d3 100644
--- a/common-dup/pom.xml
+++ b/common-dup/pom.xml
@@ -37,18 +37,18 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
 
     <dependency>
diff --git a/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicy.java b/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicy.java
index c62ce998..4f5ac589 100644
--- a/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicy.java
+++ b/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicy.java
@@ -18,8 +18,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * A set of data showing, for a single DuraCloud account, which spaces
diff --git a/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicyManager.java b/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicyManager.java
index 13c63109..85a4db4f 100644
--- a/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicyManager.java
+++ b/common-dup/src/main/java/org/duracloud/mill/dup/DuplicationPolicyManager.java
@@ -15,8 +15,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.duracloud.mill.dup.repo.DuplicationPolicyRepo;
 
 /**
diff --git a/common/pom.xml b/common/pom.xml
index 2668a6da..6818d29a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -47,21 +47,6 @@
       <artifactId>aws-java-sdk-ses</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/loopingtaskproducer/pom.xml b/loopingtaskproducer/pom.xml
index 2642e3e8..87ed177e 100644
--- a/loopingtaskproducer/pom.xml
+++ b/loopingtaskproducer/pom.xml
@@ -101,6 +101,11 @@
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/loopingtaskproducer/src/main/java/org/duracloud/mill/ltp/StateManager.java b/loopingtaskproducer/src/main/java/org/duracloud/mill/ltp/StateManager.java
index 2b135a83..e842c14b 100644
--- a/loopingtaskproducer/src/main/java/org/duracloud/mill/ltp/StateManager.java
+++ b/loopingtaskproducer/src/main/java/org/duracloud/mill/ltp/StateManager.java
@@ -11,8 +11,8 @@
 import java.util.Date;
 import java.util.LinkedHashSet;
 
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.JavaType;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/pom.xml b/pom.xml
index 487c94d3..493db726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,6 +177,7 @@
     <spring.framework.data.jpa.version>1.10.1.RELEASE</spring.framework.data.jpa.version>
     <hibernate.version>5.1.0.Final</hibernate.version>
     <mysql.driver.version>5.1.28</mysql.driver.version>
+    <jackson.version>2.7.4</jackson.version>
     <skipUTs>false</skipUTs>
     <skipITs>true</skipITs>
     <slf4j.version>1.7.6</slf4j.version>
@@ -594,21 +595,21 @@
       </dependency>
 
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
-        <version>1.9.5</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
-        <version>1.9.5</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-xc</artifactId>
-        <version>1.9.5</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
       </dependency>
 
       <dependency>