Skip to content
Snippets Groups Projects
Commit 009c79e5 authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge pull request #715 from viirya/dev1

fix a bug in build process that pulls in two versions of ASM.
parents 985a9e32 3aad4526
No related branches found
No related tags found
No related merge requests found
...@@ -183,10 +183,10 @@ object SparkBuild extends Build { ...@@ -183,10 +183,10 @@ object SparkBuild extends Build {
if (HADOOP_YARN) { if (HADOOP_YARN) {
Seq( Seq(
// Exclude rule required for all ? // Exclude rule required for all ?
"org.apache.hadoop" % "hadoop-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), "org.apache.hadoop" % "hadoop-yarn-api" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm),
"org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty), "org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm),
"org.apache.hadoop" % "hadoop-yarn-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty) "org.apache.hadoop" % "hadoop-yarn-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm)
) )
} else { } else {
Seq( Seq(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment