Skip to content

Commit

Permalink
Moves Guava 15 exclusion from SBT build to POM
Browse files Browse the repository at this point in the history
  • Loading branch information
liancheng committed Mar 5, 2015
1 parent 282bd2a commit 91ae9fa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -583,10 +583,18 @@
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<!-- Guava is excluded because of SPARK-6149. The Guava version referenced in this module is
15.0, which causes runtime incompatibility issues. -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.10</artifactId>
<version>${fasterxml.jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
Expand Down
8 changes: 1 addition & 7 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,7 @@ object Flume {
*/
object ExludedDependencies {
lazy val settings = Seq(
libraryDependencies ~= { libs =>
libs.filterNot(_.name == "groovy-all").map {
case m if m.organization == "com.fasterxml.jackson.module" =>
m.exclude("com.google.guava", "guava")
case m => m
}
}
libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") }
)
}

Expand Down

0 comments on commit 91ae9fa

Please sign in to comment.