From 65b25b842990fa1af292bd1ae6ff3772258f30a8 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Thu, 7 Apr 2022 09:19:36 +0200
Subject: [PATCH 1/2] HADOOP-18178. Upgrade jackson to 2.13.2 and
 jackson-databind to 2.13.2.2 (#4111)

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 4b786c797a76d00ef33237fde76f2bd6edda7f3a)

 Conflicts:
	LICENSE-binary
---
 LICENSE-binary         | 12 ++++++------
 hadoop-project/pom.xml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index faeab9a50b20b..bacad8b6b4f12 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -217,12 +217,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.0
 com.amazonaws:aws-java-sdk-bundle:1.11.901
 com.cedarsoftware:java-util:1.9.0
 com.cedarsoftware:json-io:2.5.1
-com.fasterxml.jackson.core:jackson-annotations:2.10.5
-com.fasterxml.jackson.core:jackson-core:2.10.5
-com.fasterxml.jackson.core:jackson-databind:2.10.5.1
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.10.5
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.10.5
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.5
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2.2
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.2
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.2
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.2
 com.fasterxml.uuid:java-uuid-generator:3.1.4
 com.fasterxml.woodstox:woodstox-core:5.3.0
 com.github.davidmoten:rxjava-extras:0.8.0.17
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 75df4c5888525..591086f61d247 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -70,8 +70,8 @@
 
     <!-- jackson versions -->
     <jackson.version>1.9.13</jackson.version>
-    <jackson2.version>2.13.0</jackson2.version>
-    <jackson2.databind.version>2.13.0</jackson2.databind.version>
+    <jackson2.version>2.13.2</jackson2.version>
+    <jackson2.databind.version>2.13.2.2</jackson2.databind.version>
 
     <!-- javax ws rs api version -->
     <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>

From 1c026946e3e94ce3f4cdb83a727a78d2c16d2c38 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <akiraaj@amazon.com>
Date: Sat, 9 Apr 2022 17:32:24 +0900
Subject: [PATCH 2/2] Update the exclusion settings for the module-info.class

---
 hadoop-client-modules/hadoop-client-minicluster/pom.xml | 2 +-
 hadoop-client-modules/hadoop-client-runtime/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index aa64544e7d179..2764b9e534454 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -744,7 +744,7 @@
                     <filter>
                       <artifact>com.fasterxml.jackson.*:*</artifact>
                       <excludes>
-                        <exclude>META-INF/versions/11/module-info.class</exclude>
+                        <exclude>META-INF/versions/9/module-info.class</exclude>
                       </excludes>
                     </filter>
 
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index d4f636de712df..16adfd0aa5225 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -246,7 +246,7 @@
                     <filter>
                       <artifact>com.fasterxml.jackson.*:*</artifact>
                       <excludes>
-                        <exclude>META-INF/versions/11/module-info.class</exclude>
+                        <exclude>META-INF/versions/9/module-info.class</exclude>
                       </excludes>
                     </filter>
                   </filters>