Skip to content

Commit 2c9fb00

Browse files
committed
Merge pull request #160 from rxin/build
Exclude asm, jackson, and netty from hadoop client. Changed jets3t's version to 0.7.1.
2 parents b88bc39 + 5937aa6 commit 2c9fb00

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

project/SharkBuild.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ object SharkBuild extends Build {
4545
val excludeKyro = ExclusionRule(organization = "de.javakaffee")
4646
val excludeHadoop = ExclusionRule(organization = "org.apache.hadoop")
4747
val excludeNetty = ExclusionRule(organization = "org.jboss.netty")
48+
val excludeJackson = ExclusionRule(organization = "org.codehaus.jackson")
49+
val excludeAsm = ExclusionRule(organization = "asm")
50+
val excludeSnappy = ExclusionRule(organization = "org.xerial.snappy")
4851

4952
def coreSettings = Defaults.defaultSettings ++ Seq(
5053

@@ -100,7 +103,7 @@ object SharkBuild extends Build {
100103
"org.apache.spark" %% "spark-core" % SPARK_VERSION,
101104
"org.apache.spark" %% "spark-repl" % SPARK_VERSION,
102105
"com.google.guava" % "guava" % "14.0.1",
103-
"org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeNetty),
106+
"org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty, excludeAsm),
104107
// See https://code.google.com/p/guava-libraries/issues/detail?id=1095
105108
"com.google.code.findbugs" % "jsr305" % "1.3.+",
106109

@@ -112,7 +115,7 @@ object SharkBuild extends Build {
112115
// Test infrastructure
113116
"org.scalatest" %% "scalatest" % "1.9.1" % "test",
114117
"junit" % "junit" % "4.10" % "test",
115-
"net.java.dev.jets3t" % "jets3t" % "0.9.0",
118+
"net.java.dev.jets3t" % "jets3t" % "0.7.1",
116119
"com.novocode" % "junit-interface" % "0.8" % "test") ++
117120
(if (TACHYON_ENABLED) Some("org.tachyonproject" % "tachyon" % "0.3.0-SNAPSHOT" excludeAll(excludeKyro, excludeHadoop) ) else None).toSeq
118121
)

0 commit comments

Comments
 (0)