From 7195637a41c8de06f9b2b4e07e83bed89bd724f0 Mon Sep 17 00:00:00 2001
From: Jan Rudert <jan.rudert@zanox.com>
Date: Mon, 5 Aug 2013 09:16:57 +0200
Subject: [PATCH] use same hadoop version as druid master (0.20.2)

---
 indexing-hadoop/pom.xml |  6 +-----
 pom.xml                 | 15 ++-------------
 server/pom.xml          |  7 +------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/indexing-hadoop/pom.xml b/indexing-hadoop/pom.xml
index 04fa6f06f8f..2abed0a074a 100644
--- a/indexing-hadoop/pom.xml
+++ b/indexing-hadoop/pom.xml
@@ -77,11 +77,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-hdfs</artifactId>
+            <artifactId>hadoop-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index c92b20a45b3..e96f2b4b8b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,19 +145,8 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-client</artifactId>
-                <version>2.0.0-mr1-cdh4.1.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>servlet-api-2.5</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-hdfs</artifactId>
-                <version>2.0.0-cdh4.1.1</version>
+                <artifactId>hadoop-core</artifactId>
+                <version>0.20.2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.mortbay.jetty</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index bad640290c6..549334ca652 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -170,13 +170,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client</artifactId>
+            <artifactId>hadoop-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-hdfs</artifactId>
-        </dependency>
-
 
         <!-- Dependencies required for jets3t b/c emr pom doesn't include them -->
         <dependency>