From 9d857e061bdbdad4f18e9edef8fe813b022959b9 Mon Sep 17 00:00:00 2001
From: Igor Dvorzhak <idv@google.com>
Date: Fri, 17 Jun 2022 16:08:11 -0700
Subject: [PATCH 1/2] HADOOP-18300. Upgrade Gson dependency to version 2.9.0

---
 hadoop-client-modules/hadoop-client-minicluster/pom.xml | 6 ++++++
 hadoop-client-modules/hadoop-client-runtime/pom.xml     | 7 +++++++
 hadoop-project/pom.xml                                  | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 06e36837a2098..4c8900dc2af0d 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -757,6 +757,12 @@
                         <exclude>META-INF/versions/11/module-info.class</exclude>
                       </excludes>
                     </filter>
+                    <filter>
+                      <artifact>com.google.code.gson:gson</artifact>
+                      <excludes>
+                        <exclude>META-INF/versions/9/module-info.class</exclude>
+                      </excludes>
+                    </filter>
 
                     <!-- Mockito tries to include its own unrelocated copy of hamcrest. :( -->
                     <filter>
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index 35fbd7665fb26..98756c2439544 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -249,6 +249,13 @@
                         <exclude>META-INF/versions/11/module-info.class</exclude>
                       </excludes>
                     </filter>
+                    <filter>
+                      <artifact>com.google.code.gson:gson</artifact>
+                      <excludes>
+                        <exclude>META-INF/versions/9/module-info.class</exclude>
+                      </excludes>
+                    </filter>
+
                   </filters>
                   <relocations>
                     <relocation>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index e27e74f835ce5..8c37b81156374 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -141,7 +141,7 @@
     <jdom2.version>2.0.6.1</jdom2.version>
     <jna.version>5.2.0</jna.version>
     <grizzly.version>2.2.21</grizzly.version>
-    <gson.version>2.8.9</gson.version>
+    <gson.version>2.9.0</gson.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
     <netty4.version>4.1.68.Final</netty4.version>

From 9b556d446a5d851f9c08d7f046e8f85f408ddf2c Mon Sep 17 00:00:00 2001
From: Igor Dvorzhak <idv@google.com>
Date: Mon, 20 Jun 2022 09:11:17 -0700
Subject: [PATCH 2/2] Update LICENSE-binary

---
 LICENSE-binary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 980b9c7f2b62a..499485263906a 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -231,7 +231,7 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1
 com.google:guice:4.0
 com.google:guice-servlet:4.0
 com.google.api.grpc:proto-google-common-protos:1.0.0
-com.google.code.gson:2.2.4
+com.google.code.gson:2.9.0
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.j2objc:j2objc-annotations:1.1
 com.google.json-simple:json-simple:1.1.1