From dfafd86370c541aef2f01705f90f665463589503 Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robertk@palantir.com>
Date: Fri, 28 Apr 2017 12:37:44 -0400
Subject: [PATCH 1/3] exclude cbor

---
 cloud/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cloud/pom.xml b/cloud/pom.xml
index 78305fa3a59db..f1d78ee6ae212 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -53,6 +53,12 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-aws</artifactId>
       <scope>${hadoop.deps.scope}</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.dataformat</groupId>
+          <artifactId>jackson-dataformat-cbor</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

From 1c1accb64ca4e196394d7a9faa305e5c6e917851 Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robertk@palantir.com>
Date: Fri, 28 Apr 2017 14:22:36 -0400
Subject: [PATCH 2/3] and bump joda

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

diff --git a/pom.xml b/pom.xml
index c0aa9fea112a8..67e9de082dbbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
     <datanucleus-core.version>3.2.10</datanucleus-core.version>
     <janino.version>3.0.0</janino.version>
     <jersey.version>2.22.2</jersey.version>
-    <joda.version>2.9.3</joda.version>
+    <joda.version>2.9.9</joda.version>
     <jodd.version>3.5.2</jodd.version>
     <jsr305.version>1.3.9</jsr305.version>
     <libthrift.version>0.9.3</libthrift.version>

From 9f6789e747afec532fc5c46d475607532148e7f0 Mon Sep 17 00:00:00 2001
From: Robert Kruszewski <robertk@palantir.com>
Date: Fri, 28 Apr 2017 14:58:36 -0400
Subject: [PATCH 3/3] joda

---
 dev/deps/spark-deps-hadoop-palantir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/deps/spark-deps-hadoop-palantir b/dev/deps/spark-deps-hadoop-palantir
index f8c636c6cd8b9..3f2985dd2167c 100644
--- a/dev/deps/spark-deps-hadoop-palantir
+++ b/dev/deps/spark-deps-hadoop-palantir
@@ -137,7 +137,7 @@ jetty-sslengine-6.1.26.jar
 jetty-util-6.1.26.jar
 jline-2.12.1.jar
 jmespath-java-1.0.jar
-joda-time-2.9.3.jar
+joda-time-2.9.9.jar
 jodd-core-3.5.2.jar
 json-smart-1.1.1.jar
 json4s-ast_2.11-3.2.11.jar