From 97c57eabce5a745f418bdcde3b5cf08cc6e1d610 Mon Sep 17 00:00:00 2001
From: jon-wei <jon.wei@imply.io>
Date: Tue, 8 Oct 2019 16:49:35 -0700
Subject: [PATCH 1/5] Fix missing jackson jars for hadoop ingestion

---
 extensions-core/hdfs-storage/pom.xml | 10 ++++++++++
 indexing-hadoop/pom.xml              |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 49e19650fb08..97814444e3da 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -355,6 +355,16 @@
         <artifactId>hadoop-hdfs-client</artifactId>
         <scope>runtime</scope>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-jaxrs</artifactId>
+        <version>1.9.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-xc</artifactId>
+        <version>1.9.13</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index 23a871acdecb..d69e83a25938 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -80,6 +80,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

From af4ff67b65caada07d7eea189d9a1fd4fb1b38cc Mon Sep 17 00:00:00 2001
From: jon-wei <jon.wei@imply.io>
Date: Tue, 8 Oct 2019 17:38:39 -0700
Subject: [PATCH 2/5] PR comments

---
 extensions-core/hdfs-storage/pom.xml | 8 ++++++--
 indexing-hadoop/pom.xml              | 5 +++++
 pom.xml                              | 5 +++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 97814444e3da..9e536bdddc84 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -355,15 +355,19 @@
         <artifactId>hadoop-hdfs-client</artifactId>
         <scope>runtime</scope>
       </dependency>
+      <!--
+        jackson-jaxrs and jackson-xc are not pulled in transitively, but are sometimes needed when using HDFS
+        with Hadoop batch ingestion. We explicitly include these dependencies here.
+      -->
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-jaxrs</artifactId>
-        <version>1.9.13</version>
+        <version>${codehaus.jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-xc</artifactId>
-        <version>1.9.13</version>
+        <version>${codehaus.jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index d69e83a25938..8dbc0f339a9f 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -80,6 +80,11 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <!--
+             jackson-core-asl is needed for Hadoop/HDFS, but not pulled in transitively from hadoop dependencies.
+             The library is currently pulled in transitively from Curator 4.1.0, but we include this dependency
+             explicitly here, as later Curator versions such as 4.2.0 do not depend on jackson-core-asl.
+         -->
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
diff --git a/pom.xml b/pom.xml
index 64ca5559c405..868a0d2e84ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
         <jetty.version>9.4.10.v20180503</jetty.version>
         <jersey.version>1.19.3</jersey.version>
         <!-- jackson 2.7.x causes injection error and 2.8.x can't be used because avatica is using 2.6.3 -->
+        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
         <jackson.version>2.6.7</jackson.version>
         <log4j.version>2.5</log4j.version>
         <netty3.version>3.10.6.Final</netty3.version>
@@ -908,12 +909,12 @@
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-core-asl</artifactId>
-                <version>1.9.13</version>
+                <version>${codehaus.jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.9.13</version>
+                <version>${codehaus.jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>

From 0deab68ffbe4da01903279fe8fd02fad1096fec7 Mon Sep 17 00:00:00 2001
From: jon-wei <jon.wei@imply.io>
Date: Tue, 8 Oct 2019 17:41:19 -0700
Subject: [PATCH 3/5] pom ordering

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

diff --git a/pom.xml b/pom.xml
index 868a0d2e84ed..4f1fb16064b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,8 +89,8 @@
         <jetty.version>9.4.10.v20180503</jetty.version>
         <jersey.version>1.19.3</jersey.version>
         <!-- jackson 2.7.x causes injection error and 2.8.x can't be used because avatica is using 2.6.3 -->
-        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
         <jackson.version>2.6.7</jackson.version>
+        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
         <log4j.version>2.5</log4j.version>
         <netty3.version>3.10.6.Final</netty3.version>
         <!-- Spark updated in https://github.com/apache/spark/pull/19884 -->

From 2dd9030752885334a0178d22336d76f488fb3f8d Mon Sep 17 00:00:00 2001
From: jon-wei <jon.wei@imply.io>
Date: Tue, 8 Oct 2019 19:04:55 -0700
Subject: [PATCH 4/5] New approach

---
 extensions-core/hdfs-storage/pom.xml | 18 ------------------
 indexing-hadoop/pom.xml              |  9 ---------
 2 files changed, 27 deletions(-)

diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 9e536bdddc84..4af1a3c6e7c7 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -77,10 +77,6 @@
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
-              </exclusion>
               <exclusion>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-mapper-asl</artifactId>
@@ -355,20 +351,6 @@
         <artifactId>hadoop-hdfs-client</artifactId>
         <scope>runtime</scope>
       </dependency>
-      <!--
-        jackson-jaxrs and jackson-xc are not pulled in transitively, but are sometimes needed when using HDFS
-        with Hadoop batch ingestion. We explicitly include these dependencies here.
-      -->
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-jaxrs</artifactId>
-        <version>${codehaus.jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-xc</artifactId>
-        <version>${codehaus.jackson.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index 8dbc0f339a9f..23a871acdecb 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -80,15 +80,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <!--
-             jackson-core-asl is needed for Hadoop/HDFS, but not pulled in transitively from hadoop dependencies.
-             The library is currently pulled in transitively from Curator 4.1.0, but we include this dependency
-             explicitly here, as later Curator versions such as 4.2.0 do not depend on jackson-core-asl.
-         -->
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

From abc8167907027ccb58f8cafe3deef755675b6dc7 Mon Sep 17 00:00:00 2001
From: jon-wei <jon.wei@imply.io>
Date: Tue, 8 Oct 2019 19:41:19 -0700
Subject: [PATCH 5/5] Remove all jackson-core/mapper-asl exclusions from hdfs
 storage

---
 extensions-core/hdfs-storage/pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 4af1a3c6e7c7..fdc97d66c3fc 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -77,10 +77,6 @@
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-              </exclusion>
               <exclusion>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
@@ -181,14 +177,6 @@
               <groupId>org.apache.httpcomponents</groupId>
               <artifactId>httpcore</artifactId>
             </exclusion>
-            <exclusion>
-              <groupId>org.codehaus.jackson</groupId>
-              <artifactId>jackson-core-asl</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.codehaus.jackson</groupId>
-              <artifactId>jackson-mapper-asl</artifactId>
-            </exclusion>
             <exclusion>
               <groupId>org.apache.zookeeper</groupId>
               <artifactId>zookeeper</artifactId>