From 022c1022f52a5fad1d4978616d34d5fab59735ca Mon Sep 17 00:00:00 2001
From: Slava Tutrinov <vyacheslav.tutrinov@wandisco.com>
Date: Mon, 25 Mar 2024 14:05:16 +0300
Subject: [PATCH 1/3] HDDS-10588. set the hadoop-shaded-guava lib version up to
 1.2.0

---
 hadoop-hdds/hadoop-dependency-client/pom.xml | 13 +++++++++++++
 hadoop-hdds/hadoop-dependency-server/pom.xml | 13 +++++++++++++
 hadoop-ozone/ozonefs-hadoop3/pom.xml         | 12 ++++++++++++
 pom.xml                                      |  1 +
 4 files changed, 39 insertions(+)

diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml
index f29232090fdf..d9eaa6f18afa 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -47,6 +47,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           <groupId>org.xerial.snappy</groupId>
           <artifactId>snappy-java</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-guava</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
@@ -202,12 +206,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       </exclusions>
 
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-guava</artifactId>
+      <version>${hadoop-shaded-guava.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
       <version>${hadoop.version}</version>
       <scope>compile</scope>
       <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-guava</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 82e4c33325e2..4faa11068a7c 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -47,6 +47,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           <groupId>org.xerial.snappy</groupId>
           <artifactId>snappy-java</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-guava</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.curator</groupId>
           <artifactId>*</artifactId>
@@ -109,6 +113,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-guava</artifactId>
+      <version>${hadoop-shaded-guava.version}</version>
+    </dependency>
     <dependency>
       <!-- commons-cli is required by DFSUtil.addPBProtocol -->
       <groupId>commons-cli</groupId>
@@ -120,6 +129,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <version>${hadoop.version}</version>
       <scope>compile</scope>
       <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-guava</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>io.netty</groupId>
           <artifactId>*</artifactId>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 6c900c56f86a..f9610d2e531a 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -39,6 +39,18 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.hadoop.thirdparty</groupId>
+          <artifactId>hadoop-shaded-guava</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-guava</artifactId>
+      <version>${hadoop-shaded-guava.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/pom.xml b/pom.xml
index cad0caab3b89..c8f0ccbf01c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,6 +303,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <properties.maven.plugin.version>1.2.1</properties.maven.plugin.version>
     <maven.core.version>3.9.6</maven.core.version>
     <snappy-java.version>1.1.10.5</snappy-java.version>
+    <hadoop-shaded-guava.version>1.2.0</hadoop-shaded-guava.version>
   </properties>
 
   <dependencyManagement>

From 545f5295d658b84a2990bb37102f32ec33d6c40d Mon Sep 17 00:00:00 2001
From: Slava Tutrinov <vyacheslav.tutrinov@wandisco.com>
Date: Wed, 27 Mar 2024 09:16:58 +0300
Subject: [PATCH 2/3] HDDS-10588. revert changes from ozonefs-hadoop3 (as
 non-required), add hadoop-shaded-guava to dependencyManagement section

---
 hadoop-hdds/hadoop-dependency-client/pom.xml |  1 -
 hadoop-ozone/ozonefs-hadoop3/pom.xml         | 12 ------------
 pom.xml                                      |  5 +++++
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml
index d9eaa6f18afa..93f2d275a909 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -209,7 +209,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <dependency>
       <groupId>org.apache.hadoop.thirdparty</groupId>
       <artifactId>hadoop-shaded-guava</artifactId>
-      <version>${hadoop-shaded-guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index f9610d2e531a..6c900c56f86a 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -39,18 +39,6 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-guava</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-guava</artifactId>
-      <version>${hadoop-shaded-guava.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/pom.xml b/pom.xml
index c8f0ccbf01c3..811b63d36e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1540,6 +1540,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <artifactId>snappy-java</artifactId>
         <version>${snappy-java.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop.thirdparty</groupId>
+        <artifactId>hadoop-shaded-guava</artifactId>
+        <version>${hadoop-shaded-guava.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

From 491e66321c3bd09d709f3db0610a14334353a8f3 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:11:09 +0100
Subject: [PATCH 3/3] Remove version from hadoop-dependency-server, too

---
 hadoop-hdds/hadoop-dependency-server/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml
index 4faa11068a7c..84d3117ae866 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -116,7 +116,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <dependency>
       <groupId>org.apache.hadoop.thirdparty</groupId>
       <artifactId>hadoop-shaded-guava</artifactId>
-      <version>${hadoop-shaded-guava.version}</version>
     </dependency>
     <dependency>
       <!-- commons-cli is required by DFSUtil.addPBProtocol -->