From 282bd2a090f9baa250f91b02dd13ff6a491b8cd6 Mon Sep 17 00:00:00 2001
From: Cheng Lian <lian@databricks.com>
Date: Wed, 4 Mar 2015 21:35:56 +0800
Subject: [PATCH 1/2] Excludes Guava 15 referenced by jackson-module-scala_2.10

---
 project/SparkBuild.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e4b1b96527fbd..8a4947baf3930 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -220,7 +220,13 @@ object Flume {
   */
 object ExludedDependencies {
   lazy val settings = Seq(
-    libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") }
+    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
+      }
+    }
   )
 }
 

From 91ae9fad449d3237ec01500cb121a488df1e85c0 Mon Sep 17 00:00:00 2001
From: Cheng Lian <lian@databricks.com>
Date: Thu, 5 Mar 2015 11:36:59 +0800
Subject: [PATCH 2/2] Moves Guava 15 exclusion from SBT build to POM

---
 pom.xml                  | 8 ++++++++
 project/SparkBuild.scala | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb355bf735bee..3f1d5c796dd0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8a4947baf3930..e4b1b96527fbd 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -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") }
   )
 }