From ec51746639854653ed70d799bbae20ae78373ce0 Mon Sep 17 00:00:00 2001
From: Jason O'Sullivan <jasonosullivan34@gmail.com>
Date: Tue, 10 Mar 2026 14:18:02 +0000
Subject: [PATCH 1/3] HDDS-14778. Fixing relocation patterns

---
 hadoop-ozone/ozonefs-shaded/pom.xml | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
index a3f95f655cfb..e070670866b6 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -190,8 +190,8 @@
               </transformers>
               <relocations>
                 <relocation>
-                  <pattern>org</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.org</shadedPattern>
+                  <pattern>org.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.org.</shadedPattern>
                   <excludes>
                     <exclude>org.apache.hadoop.**</exclude>
                     <exclude>org.apache.log4j.**</exclude>
@@ -214,8 +214,8 @@
                   <shadedPattern>${ozone.shaded.prefix}.org.apache.ratis</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>com</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.com</shadedPattern>
+                  <pattern>com.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.com.</shadedPattern>
                   <excludes>
                     <!-- These packages are the ones that are not shaded in the hadoop release package.
                     To prevent conflicts, we do not include these packages in the ozone client release package.
@@ -229,8 +229,8 @@
                   </excludes>
                 </relocation>
                 <relocation>
-                  <pattern>google</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.google</shadedPattern>
+                  <pattern>google.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.google.</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>net.jcip</pattern>
@@ -253,20 +253,20 @@
                   <shadedPattern>${ozone.shaded.prefix}.jakarta.annotation</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>kotlin</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.kotlin</shadedPattern>
+                  <pattern>kotlin.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.kotlin.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>picocli</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.picocli</shadedPattern>
+                  <pattern>picocli.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.picocli.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>info</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.info</shadedPattern>
+                  <pattern>info.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.info.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>io</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.io</shadedPattern>
+                  <pattern>io.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.io.</shadedPattern>
                   <excludes>
                     <exclude>io!netty!*</exclude>
                     <!-- Exclude config keys for Hadoop that look like package names -->
@@ -286,12 +286,12 @@
 
                 <!-- handling some special packages with special names -->
                 <relocation>
-                  <pattern>okio</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.okio</shadedPattern>
+                  <pattern>okio.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.okio.</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>okhttp3</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.okhttp3</shadedPattern>
+                  <pattern>okhttp3.</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.okhttp3.</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>

From fbdf1f4c4afe1d89eaeb548e8b7a4b687caa5efd Mon Sep 17 00:00:00 2001
From: Jason O'Sullivan <jasonosullivan34@gmail.com>
Date: Wed, 18 Mar 2026 10:56:27 +0000
Subject: [PATCH 2/3] HDDS-14778. Reverting org relocation rule change

---
 hadoop-ozone/ozonefs-shaded/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
index e070670866b6..874ec9681047 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -190,8 +190,8 @@
               </transformers>
               <relocations>
                 <relocation>
-                  <pattern>org.</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.org.</shadedPattern>
+                  <pattern>org</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.org</shadedPattern>
                   <excludes>
                     <exclude>org.apache.hadoop.**</exclude>
                     <exclude>org.apache.log4j.**</exclude>

From d9fca1d26df17b36f6179aa983dc94ed2438e23a Mon Sep 17 00:00:00 2001
From: Jason O'Sullivan <jasonosullivan34@gmail.com>
Date: Wed, 18 Mar 2026 15:06:05 +0000
Subject: [PATCH 3/3] HDDS-14778. Reverting org relocation rule change

---
 hadoop-ozone/ozonefs-shaded/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
index 874ec9681047..d2c0455a23fe 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -214,8 +214,8 @@
                   <shadedPattern>${ozone.shaded.prefix}.org.apache.ratis</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>com.</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.com.</shadedPattern>
+                  <pattern>com</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.com</shadedPattern>
                   <excludes>
                     <!-- These packages are the ones that are not shaded in the hadoop release package.
                     To prevent conflicts, we do not include these packages in the ozone client release package.
@@ -286,12 +286,12 @@
 
                 <!-- handling some special packages with special names -->
                 <relocation>
-                  <pattern>okio.</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.okio.</shadedPattern>
+                  <pattern>okio</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.okio</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>okhttp3.</pattern>
-                  <shadedPattern>${ozone.shaded.prefix}.okhttp3.</shadedPattern>
+                  <pattern>okhttp3</pattern>
+                  <shadedPattern>${ozone.shaded.prefix}.okhttp3</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>