From f5306597f4cb12f23983d7e961fee43b573d695a Mon Sep 17 00:00:00 2001
From: Terry W Brady <terrywbrady@gmail.com>
Date: Fri, 4 May 2018 11:01:49 -0700
Subject: [PATCH 1/3] jackson version issues

---
 dspace-api/pom.xml  |  2 +-
 dspace-rest/pom.xml | 47 +++++++++++++++++++++++++++++++++++++++++----
 pom.xml             |  3 ++-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index ae304ff62f..cb1e007466 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -704,7 +704,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>2.22.1</version>
+            <version>${jersey.version}</version>
         </dependency>
         <!-- S3 -->
         <dependency>
diff --git a/dspace-rest/pom.xml b/dspace-rest/pom.xml
index 1776bdd22d..381a403b7f 100644
--- a/dspace-rest/pom.xml
+++ b/dspace-rest/pom.xml
@@ -51,30 +51,69 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
-            <version>2.22.1</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <version>2.22.1</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>2.22.1</version>
+            <version>${jersey.version}</version>
             <exclusions>
                 <!-- Pinned to 2.5.4 below, this is because the current version number includes both 2.5.4 AND 2.5.0 jackson-annotations-->
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-annotations</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-jaxrs-base</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-jaxrs-json-provider</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-module-jaxb-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                    <artifactId>jackson-jaxrs-base</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                    <artifactId>jackson-jaxrs-json-provider</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.module</groupId>
+                    <artifactId>jackson-module-jaxb-annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.5.4</version>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-base</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!-- Spring 3 dependencies -->
diff --git a/pom.xml b/pom.xml
index 5d79df4a70..667ba8d1d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-        <jackson.version>2.9.3</jackson.version>
+        <jackson.version>2.7.0</jackson.version>
+        <jersey.version>2.22.1</jersey.version>
         <java.version>1.7</java.version>
         <postgresql.driver.version>42.2.1</postgresql.driver.version>
         <solr.version>4.10.4</solr.version>

From cfb758d8ee8a49ea6f3247df0d02549433282964 Mon Sep 17 00:00:00 2001
From: Terry W Brady <terrywbrady@gmail.com>
Date: Fri, 4 May 2018 11:35:56 -0700
Subject: [PATCH 2/3] update version for synk issues

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 667ba8d1d5..9d802d7185 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-        <jackson.version>2.7.0</jackson.version>
+        <jackson.version>2.8.9</jackson.version>
         <jersey.version>2.22.1</jersey.version>
         <java.version>1.7</java.version>
         <postgresql.driver.version>42.2.1</postgresql.driver.version>

From 79ca53954d0bcc0dd985665e42f9b6bcd9f5fbb4 Mon Sep 17 00:00:00 2001
From: Terry W Brady <terrywbrady@gmail.com>
Date: Fri, 4 May 2018 11:52:10 -0700
Subject: [PATCH 3/3] upgrade jackson and comment

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9d802d7185..bcd68236d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-        <jackson.version>2.8.9</jackson.version>
+        
+        <!--  See https://jira.duraspace.org/browse/DS-3903 for a discussion of the version of jackson that is needed -->
+        <jackson.version>2.8.11</jackson.version>
         <jersey.version>2.22.1</jersey.version>
         <java.version>1.7</java.version>
         <postgresql.driver.version>42.2.1</postgresql.driver.version>