Skip to content

Commit 91ae9fa

Browse files
committed
Moves Guava 15 exclusion from SBT build to POM
1 parent 282bd2a commit 91ae9fa

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,10 +583,18 @@
583583
<artifactId>jackson-databind</artifactId>
584584
<version>${fasterxml.jackson.version}</version>
585585
</dependency>
586+
<!-- Guava is excluded because of SPARK-6149. The Guava version referenced in this module is
587+
15.0, which causes runtime incompatibility issues. -->
586588
<dependency>
587589
<groupId>com.fasterxml.jackson.module</groupId>
588590
<artifactId>jackson-module-scala_2.10</artifactId>
589591
<version>${fasterxml.jackson.version}</version>
592+
<exclusions>
593+
<exclusion>
594+
<groupId>com.google.guava</groupId>
595+
<artifactId>guava</artifactId>
596+
</exclusion>
597+
</exclusions>
590598
</dependency>
591599
<dependency>
592600
<groupId>org.scala-lang</groupId>

project/SparkBuild.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,7 @@ object Flume {
220220
*/
221221
object ExludedDependencies {
222222
lazy val settings = Seq(
223-
libraryDependencies ~= { libs =>
224-
libs.filterNot(_.name == "groovy-all").map {
225-
case m if m.organization == "com.fasterxml.jackson.module" =>
226-
m.exclude("com.google.guava", "guava")
227-
case m => m
228-
}
229-
}
223+
libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") }
230224
)
231225
}
232226

0 commit comments

Comments
 (0)