aboutsummaryrefslogtreecommitdiff
path: root/project/SparkBuild.scala
diff options
context:
space:
mode:
authorLiang-Chi Hsieh <viirya@gmail.com>2013-07-19 02:29:46 +0800
committerLiang-Chi Hsieh <viirya@gmail.com>2013-07-19 02:29:46 +0800
commit3aad45265324537e51cab79db3f09d9310339f77 (patch)
treec718247162e470a98d192a045264ee1e78bdddf0 /project/SparkBuild.scala
parentcad48edb70c58a48f66851e963f51db712ab7863 (diff)
downloadspark-3aad45265324537e51cab79db3f09d9310339f77.tar.gz
spark-3aad45265324537e51cab79db3f09d9310339f77.tar.bz2
spark-3aad45265324537e51cab79db3f09d9310339f77.zip
fix a bug in build process that pulls in two versionf of ASM.
Diffstat (limited to 'project/SparkBuild.scala')
-rw-r--r--project/SparkBuild.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e9819b877d..59edda5097 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -183,10 +183,10 @@ object SparkBuild extends Build {
if (HADOOP_YARN) {
Seq(
// Exclude rule required for all ?
- "org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
- "org.apache.hadoop" % "hadoop-yarn-api" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
- "org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
- "org.apache.hadoop" % "hadoop-yarn-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty)
+ "org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-yarn-api" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-yarn-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm)
)
} else {
Seq(