Skip to content

Commit bf3dca2

Browse files
BrianLondonsrowen
authored andcommitted
[SPARK-12453][STREAMING] Remove explicit dependency on aws-java-sdk
Successfully ran kinesis demo on a live, aws hosted kinesis stream against master and 1.6 branches. For reasons I don't entirely understand it required a manual merge to 1.5 which I did as shown here: BrianLondon@075c22e The demo ran successfully on the 1.5 branch as well. According to `mvn dependency:tree` it is still pulling a fairly old version of the aws-java-sdk (1.9.37), but this appears to have fixed the kinesis regression in 1.5.2. Author: BrianLondon <[email protected]> Closes #10492 from BrianLondon/remove-only. (cherry picked from commit ff89975) Signed-off-by: Sean Owen <[email protected]>
1 parent 0afad66 commit bf3dca2

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

extras/kinesis-asl/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@
5959
<artifactId>amazon-kinesis-client</artifactId>
6060
<version>${aws.kinesis.client.version}</version>
6161
</dependency>
62-
<dependency>
63-
<groupId>com.amazonaws</groupId>
64-
<artifactId>aws-java-sdk</artifactId>
65-
<version>${aws.java.sdk.version}</version>
66-
</dependency>
6762
<dependency>
6863
<groupId>com.amazonaws</groupId>
6964
<artifactId>amazon-kinesis-producer</artifactId>

extras/kinesis-asl/src/main/scala/org/apache/spark/streaming/kinesis/KinesisReceiver.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ private[kinesis] class KinesisReceiver[T](
185185
workerThread.setName(s"Kinesis Receiver ${streamId}")
186186
workerThread.setDaemon(true)
187187
workerThread.start()
188+
188189
logInfo(s"Started receiver with workerId $workerId")
189190
}
190191

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
<avro.version>1.7.7</avro.version>
154154
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
155155
<jets3t.version>0.7.1</jets3t.version>
156-
<aws.java.sdk.version>1.9.40</aws.java.sdk.version>
157156
<aws.kinesis.client.version>1.4.0</aws.kinesis.client.version>
158157
<!-- the producer is used in tests -->
159158
<aws.kinesis.producer.version>0.10.1</aws.kinesis.producer.version>

0 commit comments

Comments
 (0)