From 789f83734cf7bf07593d0b687de29c9e43675aad Mon Sep 17 00:00:00 2001
From: Dylan <dwylie@spotx.tv>
Date: Mon, 19 Aug 2019 14:30:15 +0100
Subject: [PATCH] do not exclude client core jar

make indexing service depend on hadoop client
---
 indexing-hadoop/pom.xml  | 11 -----------
 indexing-service/pom.xml | 10 +++++-----
 pom.xml                  | 12 ------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index ea6f6c3fb5d9..8d0db3c0bbb2 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -84,17 +84,6 @@
             <artifactId>hadoop-common</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-mapreduce-client-core</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <!-- Tests -->
         <dependency>
diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml
index 771b493b7d81..71e67c6f4364 100644
--- a/indexing-service/pom.xml
+++ b/indexing-service/pom.xml
@@ -42,6 +42,11 @@
             <artifactId>druid-server</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
             <artifactId>druid-indexing-hadoop</artifactId>
@@ -64,11 +69,6 @@
             <artifactId>curator-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.druid</groupId>
             <artifactId>druid-core</artifactId>
diff --git a/pom.xml b/pom.xml
index e2453165621a..52b498c5a187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -660,18 +660,6 @@
                 <version>${hadoop.compile.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-mapreduce-client-core</artifactId>
-                <version>${hadoop.compile.version}</version>
-                <scope>provided</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.mapdb</groupId>
                 <artifactId>mapdb</artifactId>