@@ -264,6 +264,7 @@ object SparkBuild extends Build {
264264 val slf4jVersion = " 1.7.5"
265265
266266 val excludeNetty = ExclusionRule (organization = " org.jboss.netty" )
267+ val excludeEclipseJetty = ExclusionRule (organization = " org.eclipse.jetty" )
267268 val excludeAsm = ExclusionRule (organization = " org.ow2.asm" )
268269 val excludeOldAsm = ExclusionRule (organization = " asm" )
269270 val excludeCommonsLogging = ExclusionRule (organization = " commons-logging" )
@@ -273,6 +274,7 @@ object SparkBuild extends Build {
273274 val excludeJackson = ExclusionRule (organization = " org.codehaus.jackson" )
274275 val excludeHadoop = ExclusionRule (organization = " org.apache.hadoop" )
275276 val excludeCurator = ExclusionRule (organization = " org.apache.curator" )
277+ val excludePowermock = ExclusionRule (organization = " org.powermock" )
276278
277279
278280 def coreSettings = sharedSettings ++ Seq (
@@ -311,7 +313,7 @@ object SparkBuild extends Build {
311313 " com.codahale.metrics" % " metrics-graphite" % " 3.0.0" ,
312314 " com.twitter" %% " chill" % " 0.3.1" excludeAll(excludeAsm),
313315 " com.twitter" % " chill-java" % " 0.3.1" excludeAll(excludeAsm),
314- " org.tachyonproject" % " tachyon" % " 0.4.1" excludeAll(excludeKyro, excludeHadoop, excludeCurator, excludeJackson, excludeNetty, excludeAsm ),
316+ " org.tachyonproject" % " tachyon" % " 0.4.1" excludeAll(excludeHadoop, excludeCurator, excludeEclipseJetty, excludePowermock ),
315317 " com.clearspring.analytics" % " stream" % " 2.5.1"
316318 ),
317319 libraryDependencies ++= maybeAvro
0 commit comments