Skip to content

Commit 8093de1

Browse files
bijaybishtpwendell
authored andcommitted
Ported hadoopClient jar for < 1.0.1 fix
apache#522 got messed after i rewrote the branch hadoop_jar_name. So created a new one. Author: Bijay Bisht <bijay.bisht@gmail.com> Closes apache#584 from bijaybisht/hadoop_jar_name_on_0.9.0 and squashes the following commits: 1b6fb3c [Bijay Bisht] Ported hadoopClient jar for < 1.0.1 fix
1 parent 754bc18 commit 8093de1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

project/SparkBuild.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ object SparkBuild extends Build {
9090
case None => DEFAULT_YARN
9191
case Some(v) => v.toBoolean
9292
}
93+
lazy val hadoopClient = if (hadoopVersion.startsWith("0.20.") || hadoopVersion == "1.0.0") "hadoop-core" else "hadoop-client"
9394

9495
// Conditionally include the yarn sub-project
9596
lazy val yarnAlpha = Project("yarn-alpha", file("yarn/alpha"), settings = yarnAlphaSettings) dependsOn(core)
@@ -273,7 +274,7 @@ object SparkBuild extends Build {
273274
"org.apache.mesos" % "mesos" % "0.13.0",
274275
"net.java.dev.jets3t" % "jets3t" % "0.7.1",
275276
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
276-
"org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
277+
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
277278
"org.apache.avro" % "avro" % "1.7.4",
278279
"org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty),
279280
"org.apache.zookeeper" % "zookeeper" % "3.4.5" excludeAll(excludeNetty),
@@ -377,7 +378,7 @@ object SparkBuild extends Build {
377378
def yarnEnabledSettings = Seq(
378379
libraryDependencies ++= Seq(
379380
// Exclude rule required for all ?
380-
"org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
381+
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
381382
"org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
382383
"org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
383384
"org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib)

0 commit comments

Comments
 (0)