diff --git a/project/SharkBuild.scala b/project/SharkBuild.scala index 2ce13739..79b838a0 100755 --- a/project/SharkBuild.scala +++ b/project/SharkBuild.scala @@ -54,6 +54,7 @@ object SharkBuild extends Build { val excludeKyro = ExclusionRule(organization = "de.javakaffee") val excludeHadoop = ExclusionRule(organization = "org.apache.hadoop") val excludeNetty = ExclusionRule(organization = "org.jboss.netty") + val excludeCurator = ExclusionRule(organization = "org.apache.curator") val excludeJackson = ExclusionRule(organization = "org.codehaus.jackson") val excludeAsm = ExclusionRule(organization = "asm") val excludeSnappy = ExclusionRule(organization = "org.xerial.snappy") @@ -127,7 +128,7 @@ object SharkBuild extends Build { "net.java.dev.jets3t" % "jets3t" % "0.7.1", "com.novocode" % "junit-interface" % "0.8" % "test") ++ (if (YARN_ENABLED) Some("org.apache.spark" %% "spark-yarn" % SPARK_VERSION) else None).toSeq ++ - (if (TACHYON_ENABLED) Some("org.tachyonproject" % "tachyon" % "0.3.0-SNAPSHOT" excludeAll(excludeKyro, excludeHadoop) ) else None).toSeq + (if (TACHYON_ENABLED) Some("org.tachyonproject" % "tachyon" % "0.3.0-SNAPSHOT" excludeAll(excludeKyro, excludeHadoop, excludeCurator, excludeJackson, excludeNetty, excludeAsm) ) else None).toSeq ) def assemblyProjSettings = Seq(