From bb7adacb2b19e7d5f645ed3d6dbcde4d461f1f44 Mon Sep 17 00:00:00 2001
From: tballison <tallison@mitre.org>
Date: Thu, 19 Apr 2018 09:27:18 -0400
Subject: [PATCH] TIKA-2634 upgrade Jackson to 2.9.5

---
 tika-nlp/pom.xml       | 13 ++++++++++++-
 tika-parent/pom.xml    |  1 +
 tika-parsers/pom.xml   | 23 ++++++++++++++++++++++-
 tika-translate/pom.xml | 25 ++++++++++++++++++++++++-
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index 7b59e25f03..414f60730e 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -187,7 +187,18 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.6.5</version>
+      <version>${jackson.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
     <!-- Test dependencies -->
     <dependency>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 894b0d595c..7005f3e53c 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -311,6 +311,7 @@
     <gson.version>2.8.1</gson.version>
     <cxf.version>3.0.16</cxf.version>
     <slf4j.version>1.7.24</slf4j.version>
+    <jackson.version>2.9.5</jackson.version>
   </properties>
 
   <build>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index e6c7720278..891ba96fc6 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -683,8 +683,29 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.4</version>
+      <version>${jackson.version}</version>
     </dependency>
+    <!-- as of 2.9.5, jackson-databind is pulling in jackson-annotations 2.9.0
+      For now, we need to specify databind here with exclusion statement
+    -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+
+
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>jbig2-imageio</artifactId>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index b8e6919303..2bcb505ea1 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -66,11 +66,34 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <version>${cxf.version}</version>
+      <exclusions>
+        <!-- exclude because, as of 2.9.5, jaxb-annotations
+        is bringing in 2.9.0 of core's annotations
+        -->
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.9.4</version>
+      <version>${jackson.version}</version>
+      <exclusions>
+        <!-- exclude because, as of 2.9.5, jaxrs-json-provider
+        is bringing in 2.9.0 of core's annotations
+        -->
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
 
     <!-- Test dependencies -->