From 5395ad01a9622175919667839a77568623859c45 Mon Sep 17 00:00:00 2001
From: Brian O'Neill <boneill@monetate.com>
Date: Wed, 6 Apr 2016 12:21:59 -0400
Subject: [PATCH 1/6] Upgraded KCL version to support de-aggregation of Kinesis
 records. See: SPARK-14421

---
 extras/kinesis-asl-assembly/pom.xml | 2 ++
 pom.xml                             | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index 99a43fefce159..6f5c13d719336 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -60,11 +60,13 @@
       <artifactId>commons-lang</artifactId>
       <scope>provided</scope>
     </dependency>
+<!--
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
       <scope>provided</scope>
     </dependency>
+-->
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
diff --git a/pom.xml b/pom.xml
index b1a5d28a7f91d..81a861748ebb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
     <slf4j.version>1.7.10</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <hadoop.version>2.2.0</hadoop.version>
-    <protobuf.version>2.5.0</protobuf.version>
+    <protobuf.version>2.6.1</protobuf.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <hbase.version>0.98.7-hadoop2</hbase.version>
     <hbase.artifact>hbase</hbase.artifact>
@@ -153,7 +153,7 @@
     <avro.version>1.7.7</avro.version>
     <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
     <jets3t.version>0.7.1</jets3t.version>
-    <aws.kinesis.client.version>1.4.0</aws.kinesis.client.version>
+    <aws.kinesis.client.version>1.6.2</aws.kinesis.client.version>
     <!-- the producer is used in tests -->
     <aws.kinesis.producer.version>0.10.1</aws.kinesis.producer.version>
     <!--  org.apache.httpcomponents/httpclient-->

From c8235444fb5227be16810b4e6e72bf29c41947bb Mon Sep 17 00:00:00 2001
From: Brian O'Neill <boneill@monetate.com>
Date: Wed, 6 Apr 2016 15:15:10 -0400
Subject: [PATCH 2/6] Revering parent protobuf version, moving to explicit
 version at kinesis-asl-assembly level.

---
 extras/kinesis-asl-assembly/pom.xml | 9 ++++++---
 pom.xml                             | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index 6f5c13d719336..14c0458aa022a 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -60,13 +60,16 @@
       <artifactId>commons-lang</artifactId>
       <scope>provided</scope>
     </dependency>
-<!--
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <scope>provided</scope>
+      <version>2.6.1</version>
+      <!-- 
+         We are being explicit about version here and overriding the 
+         spark default of 2.5.0 because KCL appears to have introduced 
+         a dependency on protobuf 2.6.1 somewhere between KCL 1.4.0 and 1.6.1.
+       -->
     </dependency>
--->
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
diff --git a/pom.xml b/pom.xml
index 81a861748ebb9..730b9990fa077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
     <slf4j.version>1.7.10</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <hadoop.version>2.2.0</hadoop.version>
-    <protobuf.version>2.6.1</protobuf.version>
+    <protobuf.version>2.5.0</protobuf.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <hbase.version>0.98.7-hadoop2</hbase.version>
     <hbase.artifact>hbase</hbase.artifact>

From 5705a70938fcfd1fc0fb692e03f84f3a704b1808 Mon Sep 17 00:00:00 2001
From: Brian O'Neill <boneill@monetate.com>
Date: Thu, 7 Apr 2016 15:25:48 -0400
Subject: [PATCH 3/6] Adding relocation, as not to step on protobuf 2.5.0 from
 Spark pom

---
 extras/kinesis-asl-assembly/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index 14c0458aa022a..8659c6b57bda1 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -147,6 +147,15 @@
             <include>*:*</include>
           </includes>
         </artifactSet>
+        <relocations>
+            <relocation>
+              <pattern>com.google.protobuf</pattern>
+              <shadedPattern>kcl.protobuf</shadedPattern>
+              <includes>
+                <include>com.google.protobuf</include>
+              </includes>
+            </relocation>
+        </relocations>
         <filters>
           <filter>
             <artifact>*:*</artifact>

From 7a54d339dcb577dc764f7a2ae37ad06a5cf231be Mon Sep 17 00:00:00 2001
From: Brian O'Neill <boneill@monetate.com>
Date: Thu, 7 Apr 2016 15:36:12 -0400
Subject: [PATCH 4/6] Protobuf relocation

---
 extras/kinesis-asl-assembly/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index 8659c6b57bda1..e54e4ca7f0281 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -152,7 +152,7 @@
               <pattern>com.google.protobuf</pattern>
               <shadedPattern>kcl.protobuf</shadedPattern>
               <includes>
-                <include>com.google.protobuf</include>
+                <include>com.google.protobuf.**</include>
               </includes>
             </relocation>
         </relocations>

From fe98fc156218fb50d9c71e2be9e45037f4ba8737 Mon Sep 17 00:00:00 2001
From: Brian O'Neill <boneill@monetate.com>
Date: Fri, 8 Apr 2016 08:55:23 -0400
Subject: [PATCH 5/6] Updating package name to make it obvious what this
 package is for.

---
 extras/kinesis-asl-assembly/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index e54e4ca7f0281..fb35af923eeaa 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -150,7 +150,7 @@
         <relocations>
             <relocation>
               <pattern>com.google.protobuf</pattern>
-              <shadedPattern>kcl.protobuf</shadedPattern>
+              <shadedPattern>kinesis.protobuf</shadedPattern>
               <includes>
                 <include>com.google.protobuf.**</include>
               </includes>

From b3935599badf0fbb264c1d844c126b9bdaa88d67 Mon Sep 17 00:00:00 2001
From: Brian O'Neill <boneill@monetate.com>
Date: Fri, 8 Apr 2016 10:21:18 -0400
Subject: [PATCH 6/6] Fixing indentation

---
 extras/kinesis-asl-assembly/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index fb35af923eeaa..6f1edb52db9d1 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -148,13 +148,13 @@
           </includes>
         </artifactSet>
         <relocations>
-            <relocation>
-              <pattern>com.google.protobuf</pattern>
-              <shadedPattern>kinesis.protobuf</shadedPattern>
-              <includes>
-                <include>com.google.protobuf.**</include>
-              </includes>
-            </relocation>
+          <relocation>
+            <pattern>com.google.protobuf</pattern>
+            <shadedPattern>kinesis.protobuf</shadedPattern>
+            <includes>
+              <include>com.google.protobuf.**</include>
+            </includes>
+          </relocation>
         </relocations>
         <filters>
           <filter>