From bb0123f14902d755c9fd102c1e5d3facdd1f4b0e Mon Sep 17 00:00:00 2001
From: Vasily Malakhin <vmalakhin@gmail.com>
Date: Mon, 25 Oct 2021 19:09:23 +0100
Subject: [PATCH 1/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

---
 hadoop-cloud/pom.xml | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index fe62443967c82..9bde221444f9a 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -85,18 +85,6 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.jackson</groupId>
-          <artifactId>jackson-mapper-asl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.jackson</groupId>
-          <artifactId>jackson-core-asl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-core</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
@@ -184,18 +172,6 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.jackson</groupId>
-          <artifactId>jackson-mapper-asl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
@@ -271,18 +247,6 @@
               <groupId>org.apache.hadoop</groupId>
               <artifactId>hadoop-common</artifactId>
             </exclusion>
-            <exclusion>
-              <groupId>org.codehaus.jackson</groupId>
-              <artifactId>jackson-mapper-asl</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>com.fasterxml.jackson.core</groupId>
-              <artifactId>jackson-core</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>com.google.guava</groupId>
-              <artifactId>guava</artifactId>
-            </exclusion>
           </exclusions>
         </dependency>
         <!--

From 59750c30b3c078482d60c0c4bfc844b022c9bf5c Mon Sep 17 00:00:00 2001
From: Vasily Malakhin <vmalakhin@gmail.com>
Date: Mon, 25 Oct 2021 20:55:43 +0100
Subject: [PATCH 2/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

---
 hadoop-cloud/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index 9bde221444f9a..a9b4c3f20c216 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -124,7 +124,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
     <!--
     Add joda time to ensure that anything downstream which doesn't pull in spark-hive
     gets the correct joda time artifact, so doesn't have auth failures on later Java 8 JVMs

From e08ca45d6db4b47deae5ddc4ca642116b61e6ca0 Mon Sep 17 00:00:00 2001
From: Vasily Malakhin <vmalakhin@gmail.com>
Date: Tue, 26 Oct 2021 09:33:18 +0100
Subject: [PATCH 3/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

---
 hadoop-cloud/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index a9b4c3f20c216..9bde221444f9a 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -124,6 +124,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+
     <!--
     Add joda time to ensure that anything downstream which doesn't pull in spark-hive
     gets the correct joda time artifact, so doesn't have auth failures on later Java 8 JVMs

From a1f8e92ee6171fe2c7eadb24443e55386cb8ee56 Mon Sep 17 00:00:00 2001
From: Vasily Malakhin <vmalakhin@gmail.com>
Date: Tue, 26 Oct 2021 14:02:12 +0100
Subject: [PATCH 4/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

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

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index 9bde221444f9a..ac8e8916912fd 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -172,6 +172,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

From ec470e69ecf9572c9f15afd112f56e5b18573474 Mon Sep 17 00:00:00 2001
From: vmalakhin <49170798+vmalakhin@users.noreply.github.com>
Date: Wed, 27 Oct 2021 21:47:32 +0100
Subject: [PATCH 5/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

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

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index ac8e8916912fd..d79e4397f18bc 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -85,6 +85,10 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-databind</artifactId>
@@ -172,6 +176,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
@@ -252,6 +260,14 @@
               <artifactId>hadoop-common</artifactId>
             </exclusion>
           </exclusions>
+            <exclusion>
+              <groupId>com.fasterxml.jackson.core</groupId>
+              <artifactId>jackson-core</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>com.google.guava</groupId>
+              <artifactId>guava</artifactId>
+            </exclusion>
         </dependency>
         <!--
         The jetty declarations are made

From 8e0c008d3169cc90f4ba541acf81684cf73cdca9 Mon Sep 17 00:00:00 2001
From: vmalakhin <49170798+vmalakhin@users.noreply.github.com>
Date: Wed, 27 Oct 2021 21:48:58 +0100
Subject: [PATCH 6/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

---
 hadoop-cloud/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index d79e4397f18bc..0c4f802aa1724 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -259,7 +259,6 @@
               <groupId>org.apache.hadoop</groupId>
               <artifactId>hadoop-common</artifactId>
             </exclusion>
-          </exclusions>
             <exclusion>
               <groupId>com.fasterxml.jackson.core</groupId>
               <artifactId>jackson-core</artifactId>

From f2209fff74b39ba2333cf6d6f51063115e3b5a85 Mon Sep 17 00:00:00 2001
From: vmalakhin <49170798+vmalakhin@users.noreply.github.com>
Date: Wed, 27 Oct 2021 21:57:41 +0100
Subject: [PATCH 7/7] SPARK-37102: Hadoop Cloud: removed redundant exclusions

---
 hadoop-cloud/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml
index 0c4f802aa1724..2e95b5778a803 100644
--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@@ -267,6 +267,7 @@
               <groupId>com.google.guava</groupId>
               <artifactId>guava</artifactId>
             </exclusion>
+          </exclusions>
         </dependency>
         <!--
         The jetty declarations are made