Skip to content

Commit 8968b67

Browse files
committed
exclude more libraries from tachyon dependency to be the same as referencing tachyon-client.
1 parent 77be7e8 commit 8968b67

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

core/pom.xml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,38 @@
214214
<groupId>org.apache.hadoop</groupId>
215215
<artifactId>hadoop-client</artifactId>
216216
</exclusion>
217-
<groupId>org.jboss.netty</groupId>
218-
<artifactId>netty</artifactId>
219217
<exclusion>
220218
<groupId>org.apache.curator</groupId>
221219
<artifactId>curator-recipes</artifactId>
222220
</exclusion>
221+
<exclusion>
222+
<groupId>org.eclipse.jetty</groupId>
223+
<artifactId>jetty-jsp</artifactId>
224+
</exclusion>
225+
<exclusion>
226+
<groupId>org.eclipse.jetty</groupId>
227+
<artifactId>jetty-webapp</artifactId>
228+
</exclusion>
229+
<exclusion>
230+
<groupId>org.eclipse.jetty</groupId>
231+
<artifactId>jetty-server</artifactId>
232+
</exclusion>
233+
<exclusion>
234+
<groupId>org.eclipse.jetty</groupId>
235+
<artifactId>jetty-servlet</artifactId>
236+
</exclusion>
237+
<exclusion>
238+
<groupId>junit</groupId>
239+
<artifactId>junit</artifactId>
240+
</exclusion>
241+
<exclusion>
242+
<groupId>org.powermock</groupId>
243+
<artifactId>powermock-module-junit4</artifactId>
244+
</exclusion>
245+
<exclusion>
246+
<groupId>org.powermock</groupId>
247+
<artifactId>powermock-api-mockito</artifactId>
248+
</exclusion>
223249
<exclusion>
224250
<groupId>org.apache.curator</groupId>
225251
<artifactId>curator-test</artifactId>

project/SparkBuild.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)