From c35285e30d47c5f60c50d377f9fd227d13857969 Mon Sep 17 00:00:00 2001
From: George Jahad <george@georgejahad.com>
Date: Sun, 30 Oct 2022 20:09:03 -0700
Subject: [PATCH 1/3] builds a shaded library that works with: 
 hadoop-client-api-3.3.1.jar   (which is used by spark)

---
 hadoop-ozone/dist/pom.xml                     |   4 +
 .../dist/src/main/license/jar-report.txt      |   1 +
 hadoop-ozone/ozonefs-hadoop-client/pom.xml    | 112 ++++++++++++++++++
 hadoop-ozone/pom.xml                          |   6 +
 4 files changed, 123 insertions(+)
 create mode 100644 hadoop-ozone/ozonefs-hadoop-client/pom.xml

diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index f030aacbbc48..34821c416fcc 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -241,6 +241,10 @@
           <groupId>org.apache.ozone</groupId>
           <artifactId>ozone-filesystem-hadoop3</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.ozone</groupId>
+          <artifactId>ozone-filesystem-hadoop-client</artifactId>
+        </dependency>
       </dependencies>
     </profile>
     <profile>
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index f71dec825ac5..e407d69373eb 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -212,6 +212,7 @@ share/ozone/lib/ozone-filesystem-common.jar
 share/ozone/lib/ozone-filesystem-hadoop2.jar
 share/ozone/lib/ozone-filesystem-hadoop3.jar
 share/ozone/lib/ozone-filesystem.jar
+share/ozone/lib/ozone-filesystem-hadoop-client.jar
 share/ozone/lib/ozone-insight.jar
 share/ozone/lib/ozone-interface-client.jar
 share/ozone/lib/ozone-interface-storage.jar
diff --git a/hadoop-ozone/ozonefs-hadoop-client/pom.xml b/hadoop-ozone/ozonefs-hadoop-client/pom.xml
new file mode 100644
index 000000000000..e5bffbb13bcd
--- /dev/null
+++ b/hadoop-ozone/ozonefs-hadoop-client/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License. See accompanying LICENSE file.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.ozone</groupId>
+    <artifactId>ozone</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>ozone-filesystem-hadoop-client</artifactId>
+  <name>Apache Ozone FS Hadoop shaded 3.x compatibility</name>
+  <packaging>jar</packaging>
+  <version>1.3.0-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ozone</groupId>
+      <artifactId>ozone-filesystem-hadoop3</artifactId>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>include-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <excludes>META-INF/versions/**/*.*</excludes>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.ozone</groupId>
+                  <artifactId>ozone-filesystem-shaded</artifactId>
+                  <version>${project.version}</version>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>target/classes</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer
+                        implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                  <resources>
+                    <resource>META-INF/BC1024KE.DSA</resource>
+                    <resource>META-INF/BC2048KE.DSA</resource>
+                    <resource>META-INF/BC1024KE.SF</resource>
+                    <resource>META-INF/BC2048KE.SF</resource>
+                  </resources>
+                </transformer>
+                <transformer
+                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer
+                        implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+                  <resource>ozone-default-generated.xml</resource>
+                </transformer>
+              </transformers>
+              <relocations>
+                <relocation>
+                  <pattern>com.google.protobuf</pattern>
+                  <shadedPattern>
+                    org.apache.hadoop.shaded.com.google.protobuf
+                  </shadedPattern>
+                  <includes>
+                    <include>com.google.protobuf.*</include>
+                  </includes>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <configuration>
+          <onlyAnalyze>org.apache.hadoop.fs.ozone.*</onlyAnalyze>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index f6f35f947295..2e1bd010f0b2 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -122,6 +122,11 @@
         <artifactId>ozone-filesystem-hadoop3</artifactId>
         <version>${ozone.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.ozone</groupId>
+        <artifactId>ozone-filesystem-hadoop-client</artifactId>
+        <version>${ozone.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.ozone</groupId>
         <artifactId>ozone-filesystem-hadoop2</artifactId>
@@ -373,6 +378,7 @@
         <module>ozonefs-shaded</module>
         <module>ozonefs-hadoop2</module>
         <module>ozonefs-hadoop3</module>
+        <module>ozonefs-hadoop-client</module>
       </modules>
     </profile>
     <profile>

From 183f13010b0ab1eebcb3f00b5353042bc74285c4 Mon Sep 17 00:00:00 2001
From: George Jahad <george@georgejahad.com>
Date: Mon, 31 Oct 2022 07:19:08 -0700
Subject: [PATCH 2/3] included "3" in artifact id

---
 hadoop-ozone/dist/pom.xml                                     | 2 +-
 hadoop-ozone/dist/src/main/license/jar-report.txt             | 2 +-
 .../{ozonefs-hadoop-client => ozonefs-hadoop3-client}/pom.xml | 2 +-
 hadoop-ozone/pom.xml                                          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename hadoop-ozone/{ozonefs-hadoop-client => ozonefs-hadoop3-client}/pom.xml (98%)

diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 34821c416fcc..a69092ac1e68 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -243,7 +243,7 @@
         </dependency>
         <dependency>
           <groupId>org.apache.ozone</groupId>
-          <artifactId>ozone-filesystem-hadoop-client</artifactId>
+          <artifactId>ozone-filesystem-hadoop3-client</artifactId>
         </dependency>
       </dependencies>
     </profile>
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt
index e407d69373eb..0e900808c1fb 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -212,7 +212,7 @@ share/ozone/lib/ozone-filesystem-common.jar
 share/ozone/lib/ozone-filesystem-hadoop2.jar
 share/ozone/lib/ozone-filesystem-hadoop3.jar
 share/ozone/lib/ozone-filesystem.jar
-share/ozone/lib/ozone-filesystem-hadoop-client.jar
+share/ozone/lib/ozone-filesystem-hadoop3-client.jar
 share/ozone/lib/ozone-insight.jar
 share/ozone/lib/ozone-interface-client.jar
 share/ozone/lib/ozone-interface-storage.jar
diff --git a/hadoop-ozone/ozonefs-hadoop-client/pom.xml b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
similarity index 98%
rename from hadoop-ozone/ozonefs-hadoop-client/pom.xml
rename to hadoop-ozone/ozonefs-hadoop3-client/pom.xml
index e5bffbb13bcd..637377193ed3 100644
--- a/hadoop-ozone/ozonefs-hadoop-client/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
@@ -21,7 +21,7 @@
     <artifactId>ozone</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
-  <artifactId>ozone-filesystem-hadoop-client</artifactId>
+  <artifactId>ozone-filesystem-hadoop3-client</artifactId>
   <name>Apache Ozone FS Hadoop shaded 3.x compatibility</name>
   <packaging>jar</packaging>
   <version>1.3.0-SNAPSHOT</version>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 2e1bd010f0b2..221cd7af0390 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -124,7 +124,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.ozone</groupId>
-        <artifactId>ozone-filesystem-hadoop-client</artifactId>
+        <artifactId>ozone-filesystem-hadoop3-client</artifactId>
         <version>${ozone.version}</version>
       </dependency>
       <dependency>
@@ -378,7 +378,7 @@
         <module>ozonefs-shaded</module>
         <module>ozonefs-hadoop2</module>
         <module>ozonefs-hadoop3</module>
-        <module>ozonefs-hadoop-client</module>
+        <module>ozonefs-hadoop3-client</module>
       </modules>
     </profile>
     <profile>

From 48e3b49aaad361fdb8b082cbeb957f7b897e4c68 Mon Sep 17 00:00:00 2001
From: George Jahad <george@georgejahad.com>
Date: Mon, 31 Oct 2022 09:37:10 -0700
Subject: [PATCH 3/3] added comment

---
 hadoop-ozone/ozonefs-hadoop3-client/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
index 637377193ed3..213fdceed0b6 100644
--- a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
@@ -21,6 +21,12 @@
     <artifactId>ozone</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
+<!--
+  This is called "ozone-filesystem-hadoop3-client" to correspond with
+  the shaded hadoop jar that it works with:
+  "hadoop-client-api.jar", (as opposed to the unshaded hadoop jar:
+  "hadoop-common.jar")
+-->
   <artifactId>ozone-filesystem-hadoop3-client</artifactId>
   <name>Apache Ozone FS Hadoop shaded 3.x compatibility</name>
   <packaging>jar</packaging>