Skip to content

Commit 1561cec

Browse files
committed
Remove "exclude *" dependencies that are causing Maven warnings, and that are apparently unneeded anyway
1 parent 46bcb95 commit 1561cec

File tree

5 files changed

+10
-61
lines changed

5 files changed

+10
-61
lines changed

examples/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,6 @@
169169
<groupId>org.apache.cassandra.deps</groupId>
170170
<artifactId>avro</artifactId>
171171
</exclusion>
172-
<exclusion>
173-
<groupId>org.sonatype.sisu.inject</groupId>
174-
<artifactId>*</artifactId>
175-
</exclusion>
176-
<exclusion>
177-
<groupId>org.xerial.snappy</groupId>
178-
<artifactId>*</artifactId>
179-
</exclusion>
180172
</exclusions>
181173
</dependency>
182174
</dependencies>

external/flume/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
<groupId>org.jboss.netty</groupId>
5454
<artifactId>netty</artifactId>
5555
</exclusion>
56-
<exclusion>
57-
<groupId>org.xerial.snappy</groupId>
58-
<artifactId>*</artifactId>
59-
</exclusion>
6056
</exclusions>
6157
</dependency>
6258
<dependency>

pom.xml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
<version>3.1</version>
375375
<scope>test</scope>
376376
</dependency>
377-
<dependency>
377+
<dependency>
378378
<groupId>org.mockito</groupId>
379379
<artifactId>mockito-all</artifactId>
380380
<version>1.8.5</version>
@@ -416,14 +416,6 @@
416416
<groupId>org.jboss.netty</groupId>
417417
<artifactId>netty</artifactId>
418418
</exclusion>
419-
<exclusion>
420-
<groupId>org.codehaus.jackson</groupId>
421-
<artifactId>*</artifactId>
422-
</exclusion>
423-
<exclusion>
424-
<groupId>org.sonatype.sisu.inject</groupId>
425-
<artifactId>*</artifactId>
426-
</exclusion>
427419
<exclusion>
428420
<groupId>commons-logging</groupId>
429421
<artifactId>commons-logging</artifactId>
@@ -448,14 +440,6 @@
448440
<groupId>org.jboss.netty</groupId>
449441
<artifactId>netty</artifactId>
450442
</exclusion>
451-
<exclusion>
452-
<groupId>org.codehaus.jackson</groupId>
453-
<artifactId>*</artifactId>
454-
</exclusion>
455-
<exclusion>
456-
<groupId>org.sonatype.sisu.inject</groupId>
457-
<artifactId>*</artifactId>
458-
</exclusion>
459443
</exclusions>
460444
</dependency>
461445
<dependency>
@@ -471,14 +455,6 @@
471455
<groupId>org.jboss.netty</groupId>
472456
<artifactId>netty</artifactId>
473457
</exclusion>
474-
<exclusion>
475-
<groupId>org.codehaus.jackson</groupId>
476-
<artifactId>*</artifactId>
477-
</exclusion>
478-
<exclusion>
479-
<groupId>org.sonatype.sisu.inject</groupId>
480-
<artifactId>*</artifactId>
481-
</exclusion>
482458
</exclusions>
483459
</dependency>
484460

@@ -495,14 +471,6 @@
495471
<groupId>org.jboss.netty</groupId>
496472
<artifactId>netty</artifactId>
497473
</exclusion>
498-
<exclusion>
499-
<groupId>org.codehaus.jackson</groupId>
500-
<artifactId>*</artifactId>
501-
</exclusion>
502-
<exclusion>
503-
<groupId>org.sonatype.sisu.inject</groupId>
504-
<artifactId>*</artifactId>
505-
</exclusion>
506474
</exclusions>
507475
</dependency>
508476
</dependencies>

project/SparkBuild.scala

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,11 @@ object SparkBuild extends Build {
243243

244244
val slf4jVersion = "1.7.5"
245245

246-
val excludeCglib = ExclusionRule(organization = "org.sonatype.sisu.inject")
247-
val excludeJackson = ExclusionRule(organization = "org.codehaus.jackson")
248246
val excludeNetty = ExclusionRule(organization = "org.jboss.netty")
249247
val excludeAsm = ExclusionRule(organization = "asm")
250-
val excludeSnappy = ExclusionRule(organization = "org.xerial.snappy")
251248
val excludeCommonsLogging = ExclusionRule(organization = "commons-logging")
252249
val excludeSLF4J = ExclusionRule(organization = "org.slf4j")
250+
val excludeScalap = ExclusionRule(organization = "org.scala-lang", artifact = "scalap")
253251

254252
def coreSettings = sharedSettings ++ Seq(
255253
name := "spark-core",
@@ -273,13 +271,13 @@ object SparkBuild extends Build {
273271
"org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty),
274272
"org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty),
275273
"org.spark-project.akka" %% "akka-testkit" % "2.2.3-shaded-protobuf" % "test",
276-
"org.json4s" %% "json4s-jackson" % "3.2.6",
274+
"org.json4s" %% "json4s-jackson" % "3.2.6" excludeAll(excludeScalap),
277275
"it.unimi.dsi" % "fastutil" % "6.4.4",
278276
"colt" % "colt" % "1.2.0",
279277
"org.apache.mesos" % "mesos" % "0.13.0",
280278
"net.java.dev.jets3t" % "jets3t" % "0.7.1" excludeAll(excludeCommonsLogging),
281279
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
282-
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib, excludeCommonsLogging, excludeSLF4J),
280+
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeNetty, excludeAsm, excludeCommonsLogging, excludeSLF4J),
283281
"org.apache.curator" % "curator-recipes" % "2.4.0" excludeAll(excludeNetty),
284282
"com.codahale.metrics" % "metrics-core" % "3.0.0",
285283
"com.codahale.metrics" % "metrics-jvm" % "3.0.0",
@@ -316,7 +314,7 @@ object SparkBuild extends Build {
316314
exclude("io.netty", "netty")
317315
exclude("jline","jline")
318316
exclude("org.apache.cassandra.deps", "avro")
319-
excludeAll(excludeSnappy, excludeCglib, excludeSLF4J)
317+
excludeAll(excludeSLF4J)
320318
)
321319
) ++ assemblySettings ++ extraAssemblySettings
322320

@@ -379,10 +377,10 @@ object SparkBuild extends Build {
379377
def yarnEnabledSettings = Seq(
380378
libraryDependencies ++= Seq(
381379
// Exclude rule required for all ?
382-
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
383-
"org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
384-
"org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib),
385-
"org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm, excludeCglib)
380+
"org.apache.hadoop" % hadoopClient % hadoopVersion excludeAll(excludeNetty, excludeAsm),
381+
"org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeNetty, excludeAsm),
382+
"org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeNetty, excludeAsm),
383+
"org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeNetty, excludeAsm)
386384
)
387385
)
388386

@@ -428,7 +426,7 @@ object SparkBuild extends Build {
428426
def flumeSettings() = sharedSettings ++ Seq(
429427
name := "spark-streaming-flume",
430428
libraryDependencies ++= Seq(
431-
"org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty, excludeSnappy)
429+
"org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty)
432430
)
433431
)
434432

streaming/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@
5555
<groupId>org.eclipse.jetty</groupId>
5656
<artifactId>jetty-server</artifactId>
5757
</dependency>
58-
<dependency>
59-
<groupId>org.codehaus.jackson</groupId>
60-
<artifactId>jackson-mapper-asl</artifactId>
61-
<version>1.9.11</version>
62-
</dependency>
6358
<dependency>
6459
<groupId>org.scala-lang</groupId>
6560
<artifactId>scala-library</artifactId>

0 commit comments

Comments
 (0)