From d41e0a9cc30c9dbf4ba311b3ed18a6942a160287 Mon Sep 17 00:00:00 2001
From: Igor Dvorzhak <idv@google.com>
Date: Wed, 22 Jun 2022 16:37:22 -0700
Subject: [PATCH] HADOOP-18300. Upgrade Gson dependency to version 2.9.0
 (#4454)

Reviewed-by: Ayush Saxena <ayushsaxena@apache.org>
Signed-off-by: Chris Nauroth <cnauroth@apache.org>
(cherry picked from commit 77d1b194c77ec62dc31f89e15594bc1250d88de3)
---
 LICENSE-binary                                          | 2 +-
 hadoop-client-modules/hadoop-client-minicluster/pom.xml | 6 ++++++
 hadoop-client-modules/hadoop-client-runtime/pom.xml     | 7 +++++++
 hadoop-project/pom.xml                                  | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 03c42f4dec..7fb2ee180d 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -232,7 +232,7 @@ com.google:guice-servlet:4.0
 com.google.android:annotations:jar:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.2.4
+com.google.code.gson:gson:2.9.0
 com.google.errorprone:error_prone_annotations:2.3.3
 com.google.j2objc:j2objc-annotations:1.1
 com.google.json-simple:json-simple:1.1.1
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index e8e58e6b91..76a2ebf036 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -747,6 +747,12 @@
                         <exclude>META-INF/versions/9/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 99bb298f8e..6f17134b94 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/9/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 bcb7d97fde..8dc1862ed5 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -141,7 +141,7 @@
     <jdom.version>1.1</jdom.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>