@@ -317,6 +317,9 @@ object SparkBuild extends Build {
317317 val excludeFastutil = ExclusionRule (organization = " it.unimi.dsi" )
318318 val excludeJruby = ExclusionRule (organization = " org.jruby" )
319319 val excludeThrift = ExclusionRule (organization = " org.apache.thrift" )
320+ val excludeCommonsLang = ExclusionRule (organization = " commons-lang" )
321+ val excludeCommonsLogging = ExclusionRule (organization = " commons-logging" )
322+ val excludeServletApi = ExclusionRule (organization = " javax.servlet" , artifact = " servlet-api" )
320323
321324 def sparkPreviousArtifact (id : String , organization : String = " org.apache.spark" ,
322325 version : String = " 0.9.0-incubating" , crossVersion : String = " 2.10" ): Option [sbt.ModuleID ] = {
@@ -490,7 +493,7 @@ object SparkBuild extends Build {
490493 javaOptions += " -XX:MaxPermSize=1g" ,
491494 libraryDependencies ++= Seq (
492495 " org.apache.hive" % " hive-metastore" % hiveVersion,
493- " org.apache.hive" % " hive-exec" % hiveVersion,
496+ " org.apache.hive" % " hive-exec" % hiveVersion excludeAll(excludeCommonsLang, excludeCommonsLogging) ,
494497 " org.apache.hive" % " hive-serde" % hiveVersion
495498 ),
496499 // Multiple queries rely on the TestHive singleton. See comments there for more details.
@@ -563,10 +566,10 @@ object SparkBuild extends Build {
563566 libraryDependencies ++= Seq (
564567 // Exclude rule required for all ?
565568 " org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm),
566- " org.apache.hadoop" % " hadoop-yarn-api" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm),
567- " org.apache.hadoop" % " hadoop-yarn-common" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm),
568- " org.apache.hadoop" % " hadoop-yarn-client" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm),
569- " org.apache.hadoop" % " hadoop-yarn-server-web-proxy" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm)
569+ " org.apache.hadoop" % " hadoop-yarn-api" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm, excludeCommonsLogging ),
570+ " org.apache.hadoop" % " hadoop-yarn-common" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm, excludeCommonsLogging ),
571+ " org.apache.hadoop" % " hadoop-yarn-client" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm, excludeCommonsLogging ),
572+ " org.apache.hadoop" % " hadoop-yarn-server-web-proxy" % hadoopVersion excludeAll(excludeJBossNetty, excludeAsm, excludeOldAsm, excludeCommonsLogging, excludeServletApi )
570573 )
571574 )
572575
0 commit comments