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") }
   )
 }