From 075c22e89bc99d5e99be21f40e0d72154a1e23a2 Mon Sep 17 00:00:00 2001
From: BrianLondon <brian@seatgeek.com>
Date: Thu, 10 Dec 2015 15:49:07 -0500
Subject: [PATCH] Remove explicit dependency on aws-java-sdk

Conflicts:
	extras/kinesis-asl/pom.xml
	pom.xml
---
 extras/kinesis-asl/pom.xml                                   | 5 -----
 .../org/apache/spark/streaming/kinesis/KinesisReceiver.scala | 1 +
 pom.xml                                                      | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml
index 0b1421b778529..24d4264c6759f 100644
--- a/extras/kinesis-asl/pom.xml
+++ b/extras/kinesis-asl/pom.xml
@@ -59,11 +59,6 @@
       <artifactId>amazon-kinesis-client</artifactId>
       <version>${aws.kinesis.client.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk</artifactId>
-      <version>${aws.java.sdk.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/extras/kinesis-asl/src/main/scala/org/apache/spark/streaming/kinesis/KinesisReceiver.scala b/extras/kinesis-asl/src/main/scala/org/apache/spark/streaming/kinesis/KinesisReceiver.scala
index 22324e821ce94..1282dafb526b1 100644
--- a/extras/kinesis-asl/src/main/scala/org/apache/spark/streaming/kinesis/KinesisReceiver.scala
+++ b/extras/kinesis-asl/src/main/scala/org/apache/spark/streaming/kinesis/KinesisReceiver.scala
@@ -178,6 +178,7 @@ private[kinesis] class KinesisReceiver(
     workerThread.setName(s"Kinesis Receiver ${streamId}")
     workerThread.setDaemon(true)
     workerThread.start()
+    
     logInfo(s"Started receiver with workerId $workerId")
   }
 
diff --git a/pom.xml b/pom.xml
index 3c745c2e8feb5..627886f640e49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,6 @@
     <avro.version>1.7.7</avro.version>
     <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
     <jets3t.version>0.7.1</jets3t.version>
-    <aws.java.sdk.version>1.9.16</aws.java.sdk.version>
     <aws.kinesis.client.version>1.3.0</aws.kinesis.client.version>
     <!--  org.apache.httpcomponents/httpclient-->
     <commons.httpclient.version>4.3.2</commons.httpclient.version>