From e6b1bd98bb0778e5ba78e651ac7df86129f2782d Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Thu, 16 Oct 2014 09:01:10 +0900
Subject: [PATCH 1/3] [SPARK-3955] Different versions between
 jackson-mapper-asl and jackson-core-asl

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2a2e1e35a09c5..6e70326bb89a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -756,6 +756,12 @@
         <artifactId>jackson-mapper-asl</artifactId>
         <version>1.8.8</version>
       </dependency>
+      <dependency>
+        <!-- Matches the version of jackson-core-asl pulled in by avro -->
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>1.8.8</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1153,7 +1159,7 @@
         <dependency>
           <groupId>org.apache.zookeeper</groupId>
           <artifactId>zookeeper</artifactId>
-          <version>3.4.5-mapr-1406</version> 
+          <version>3.4.5-mapr-1406</version>
         </dependency>
       </dependencies>
     </profile>

From ad0fc256ffc13bd4f18e20f05db816877bc5a975 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Thu, 16 Oct 2014 09:05:09 +0900
Subject: [PATCH 2/3] [SPARK-3955] Different versions between
 jackson-mapper-asl and jackson-core-asl

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e70326bb89a4..afa705d42e266 100644
--- a/pom.xml
+++ b/pom.xml
@@ -750,14 +750,13 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <!-- Matches the version of jackson-{mapper,core}-asl pulled in by avro -->
       <dependency>
-        <!-- Matches the version of jackson-core-asl pulled in by avro -->
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
         <version>1.8.8</version>
       </dependency>
       <dependency>
-        <!-- Matches the version of jackson-core-asl pulled in by avro -->
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-core-asl</artifactId>
         <version>1.8.8</version>

From e3ed00183dc6e2241a1201b63e21d298ab0f79b8 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Wed, 22 Oct 2014 12:10:03 +0900
Subject: [PATCH 3/3] [SPARK-3955] Different versions between
 jackson-mapper-asl and jackson-core-asl

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index afa705d42e266..cd259cf48415e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,7 @@
     <jets3t.version>0.7.1</jets3t.version>
     <aws.java.sdk.version>1.8.3</aws.java.sdk.version>
     <aws.kinesis.client.version>1.1.0</aws.kinesis.client.version>
+    <jackson.version>1.8.8</jackson.version>
 
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
@@ -754,12 +755,12 @@
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
-        <version>1.8.8</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-core-asl</artifactId>
-        <version>1.8.8</version>
+        <version>${jackson.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>