aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJey Kottalam <jey@cs.berkeley.edu>2013-07-22 14:03:31 -0700
committerJey Kottalam <jey@cs.berkeley.edu>2013-08-15 16:50:37 -0700
commitcb4ef19214332b5e9c2e0d0bfa0a72262122d04e (patch)
tree6ae846ece3ac07946ac574dbe644845324ac1158 /project
parent8b1c1520fc26132a21062ebb063dea25e9b36b8b (diff)
downloadspark-cb4ef19214332b5e9c2e0d0bfa0a72262122d04e.tar.gz
spark-cb4ef19214332b5e9c2e0d0bfa0a72262122d04e.tar.bz2
spark-cb4ef19214332b5e9c2e0d0bfa0a72262122d04e.zip
yarn support
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 99351ca935..ede49ea38b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -170,7 +170,7 @@ object SparkBuild extends Build {
"org.apache.mesos" % "mesos" % "0.12.1",
"io.netty" % "netty-all" % "4.0.0.Beta2",
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
- "org.apache.hadoop" % "hadoop-client" % "1.0.4",
+ "org.apache.hadoop" % "hadoop-client" % "1.0.4" excludeAll(excludeJackson, excludeNetty, excludeAsm),
"com.codahale.metrics" % "metrics-core" % "3.0.0",
"com.codahale.metrics" % "metrics-jvm" % "3.0.0",
"com.codahale.metrics" % "metrics-json" % "3.0.0",
@@ -239,12 +239,12 @@ object SparkBuild extends Build {
name := "spark-yarn",
libraryDependencies ++= Seq(
// Exclude rule required for all ?
- "org.apache.hadoop" % "hadoop-client" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty),
- "org.apache.hadoop" % "hadoop-yarn-api" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty),
- "org.apache.hadoop" % "hadoop-yarn-common" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty),
- "org.apache.hadoop" % "hadoop-yarn-client" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty)
+ "org.apache.hadoop" % "hadoop-client" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-yarn-api" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-yarn-common" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-yarn-client" % "2.0.2-alpha" excludeAll(excludeJackson, excludeNetty, excludeAsm)
)
- )
+ ) ++ assemblySettings ++ extraAssemblySettings
def extraAssemblySettings() = Seq(test in assembly := {}) ++ Seq(
mergeStrategy in assembly := {