spark git commit: [SPARK-24601][FOLLOWUP] Update Jackson to 2.9.6 in Kinesis

[sr...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master c3eaee776 -> 734c6af0d


[SPARK-24601][FOLLOWUP] Update Jackson to 2.9.6 in Kinesis

## What changes were proposed in this pull request?

Also update Kinesis SDK's Jackson to match Spark's

## How was this patch tested?

Existing tests, including Kinesis ones, which ought to be hereby triggered.
This was uncovered, I believe, in https://github.com/apache/spark/pull/22729#issuecomment-430666080

Closes #22757 from srowen/SPARK-24601.2.

Authored-by: Sean Owen <se...@databricks.com>
Signed-off-by: Sean Owen <se...@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/734c6af0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/734c6af0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/734c6af0

Branch: refs/heads/master
Commit: 734c6af0dde82310d7ca1c586935274fe661d040
Parents: c3eaee7
Author: Sean Owen <se...@databricks.com>
Authored: Thu Oct 18 07:00:00 2018 -0500
Committer: Sean Owen <se...@databricks.com>
Committed: Thu Oct 18 07:00:00 2018 -0500

----------------------------------------------------------------------
 external/kinesis-asl/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/734c6af0/external/kinesis-asl/pom.xml
----------------------------------------------------------------------
diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml
index 032aca9..0aef253 100644
--- a/external/kinesis-asl/pom.xml
+++ b/external/kinesis-asl/pom.xml
@@ -69,6 +69,13 @@
       <version>${aws.kinesis.producer.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- manage this up explicitly to match Spark; com.amazonaws:aws-java-sdk-pom specifies
+      2.6.7 but says we can manage it up -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-cbor</artifactId>
+      <version>${fasterxml.jackson.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org