Merge pull request apache#146 from shivaram/spark-1.2-build

Exclude hadoop client from Spark dependency

Author: concretevitamin

pkg/src/build.sbt

@@ -26,14 +26,15 @@ libraryDependencies ++= Seq(
   val excludeNetty = ExclusionRule(organization = "org.jboss.netty")
   val excludeAsm = ExclusionRule(organization = "asm")
   val excludeSnappy = ExclusionRule(organization = "org.xerial.snappy")
+  val excludeHadoop = ExclusionRule(organization = "org.apache.hadoop")
   val sbtYarnFlag = scala.util.Properties.envOrElse("USE_YARN", "")
   val defaultHadoopVersion = "1.0.4"
   val defaultSparkVersion = "1.1.0"
   val hadoopVersion = scala.util.Properties.envOrElse("SPARK_HADOOP_VERSION", defaultHadoopVersion)
   val sparkVersion = scala.util.Properties.envOrElse("SPARK_VERSION", defaultSparkVersion)
   libraryDependencies ++= Seq(
     "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
-    "org.apache.spark" % "spark-core_2.10" % sparkVersion
+    "org.apache.spark" % "spark-core_2.10" % sparkVersion excludeAll(excludeHadoop)
   ) ++ (if (sbtYarnFlag != "") {
           val defaultYarnVersion = "2.4.0"
           val yarnVersion = scala.util.Properties.envOrElse("SPARK_YARN_VERSION", defaultYarnVersion)

pkg/src/pom.xml

@@ -101,6 +101,12 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_2.10</artifactId>
       <version>${spark.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>