From 3bc53c3cb6b72a8a7ab9de7a4f47a262b377b6e5 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sat, 26 Mar 2022 13:05:18 +0100
Subject: [PATCH 1/2] [HADOOP-18178] upgrade jackson due to cve

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

diff --git a/LICENSE-binary b/LICENSE-binary
index de8df181fc3d1..b5ee5c00dc42a 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -218,12 +218,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.2
 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.13.0
-com.fasterxml.jackson.core:jackson-core:2.13.0
-com.fasterxml.jackson.core:jackson-databind:2.13.0
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.0
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.0
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.0
+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.1
+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 0a84f89a723fd..66a59ce545581 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.1</jackson2.databind.version>
 
     <!-- javax ws rs api version -->
     <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>

From 1fb792ff11f5722ec5646a4b710b579789ecdd22 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Tue, 5 Apr 2022 11:18:34 +0200
Subject: [PATCH 2/2] jackson2.databind.version 2.13.2.2

---
 LICENSE-binary         | 2 +-
 hadoop-project/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index b5ee5c00dc42a..ef0db1bb6a4d7 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -220,7 +220,7 @@ com.cedarsoftware:java-util:1.9.0
 com.cedarsoftware:json-io:2.5.1
 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.1
+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
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 66a59ce545581..bdca6ebb9e7aa 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -71,7 +71,7 @@
     <!-- jackson versions -->
     <jackson.version>1.9.13</jackson.version>
     <jackson2.version>2.13.2</jackson2.version>
-    <jackson2.databind.version>2.13.2.1</jackson2.databind.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>