Change hadoop-client version to avoid guava conflict

jongyoul · jongyoul · commit d1b89dd5eda0 · 2018-06-07T12:51:33.000+09:00
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
@@ -102,10 +102,6 @@
           <groupId>net.sf.py4j</groupId>
           <artifactId>py4j</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
@@ -135,6 +131,18 @@
       <artifactId>spark-core_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <version>2.6.0</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
diff --git a/spark/spark-shims/pom.xml b/spark/spark-shims/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>2.2.0</version>
+      <version>2.6.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
