diff options
| author | Bijay Bisht <bijay.bisht@gmail.com> | 2014-02-12 23:42:10 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-02-12 23:42:25 -0800 |
| commit | a3bb86179e452d348f7e8bd3859befb3ff1f4df1 (patch) | |
| tree | 7612806ce63a2292c32ae5c6fe325d88fc0be225 /project | |
| parent | 6ee0ad8fba660b48ef32dfa2f015b59cd5353a6e (diff) | |
| download | spark-a3bb86179e452d348f7e8bd3859befb3ff1f4df1.tar.gz spark-a3bb86179e452d348f7e8bd3859befb3ff1f4df1.tar.bz2 spark-a3bb86179e452d348f7e8bd3859befb3ff1f4df1.zip | |
Ported hadoopClient jar for < 1.0.1 fix
#522 got messed after i rewrote the branch hadoop_jar_name. So created a new one.
Author: Bijay Bisht <bijay.bisht@gmail.com>
Closes #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
(cherry picked from commit 8093de1bb319e86dcf0d6d8d97b043a2bc1aa8f2)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index bb79f0cd73..74bad66cfd 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -86,6 +86,7 @@ object SparkBuild extends Build { case None => DEFAULT_YARN case Some(v) => v.toBoolean } + lazy val hadoopClient = if (hadoopVersion.startsWith("0.20.") || hadoopVersion == "1.0.0") "hadoop-core" else "hadoop-client" // Conditionally include the yarn sub-project lazy val yarnAlpha = Project("yarn-alpha", file("yarn/alpha"), settings = yarnAlphaSettings) dependsOn(core) @@ -269,7 +270,7 @@ object SparkBuild extends Build { "org.apache.mesos" % "mesos" % "0.13.0", "net.java.dev.jets3t" % "jets3t" % "0.7.1", "org.apache.derby" % "derby" % "10.4.2.0" % "test", - "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), + "org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), "org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), "org.apache.zookeeper" % "zookeeper" % "3.4.5" excludeAll(excludeNetty), @@ -373,7 +374,7 @@ object SparkBuild extends Build { def yarnEnabledSettings = Seq( libraryDependencies ++= Seq( // Exclude rule required for all ? - "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), + "org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), "org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), "org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib), "org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib) |