From 399580d30232c5bc808d7c71784f555bafcfc334 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)
(cherry picked from commit d41e0a9cc30c9dbf4ba311b3ed18a6942a160287)
---
 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 dce3e0326c9..6675387f6a9 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -723,6 +723,12 @@
                         <exclude>testdata/*</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>
                       <artifact>org.mockito:mockito-all</artifact>
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index 41d96655904..9318afafbbb 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -232,6 +232,13 @@
                         <exclude>update*</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 068b7728483..1e47ff6fe6d 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -129,7 +129,7 @@
     <okhttp.version>2.7.5</okhttp.version>
     <jdom.version>1.1</jdom.version>
     <grizzly.version>2.2.21</grizzly.version>
-    <gson.version>2.8.9</gson.version>
+    <gson.version>2.9.0</gson.version>
     <htrace3.version>3.1.0-incubating</htrace3.version>
     <htrace4.version>4.1.0-incubating</htrace4.version>
     <metrics.version>3.2.4</metrics.version>