Merge pull request #178 from amplab/tachyon

Exclude more libs from tachyon (cherry picked from commit 8d0ca79) Signed-off-by: Reynold Xin <[email protected]>
amplab · Sep 30, 2013 · dc1889a · dc1889a
1 parent 88a486a
commit dc1889a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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(