From 29a16a013e00df13832d56f206aaab9de0de821b Mon Sep 17 00:00:00 2001
From: Ahmed Abualsaud <65791736+ahmedabu98@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:47:39 -0400
Subject: [PATCH] Cherrypick 32363 (#32368)

---
 sdks/java/io/iceberg/hive/exec/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdks/java/io/iceberg/hive/exec/build.gradle b/sdks/java/io/iceberg/hive/exec/build.gradle
index 581f71ddedd1..bb0b147c5a85 100644
--- a/sdks/java/io/iceberg/hive/exec/build.gradle
+++ b/sdks/java/io/iceberg/hive/exec/build.gradle
@@ -39,10 +39,10 @@ artifacts {
 shadowJar {
     zip64 true
 
-    // need to shade "com.google.guava" to avoid Guava conflict
-    relocate 'com.google.protobuf', getJavaRelocatedPath('com.google.protobuf')
-    relocate 'shaded.parquet', getJavaRelocatedPath('shaded.parquet')
-    relocate 'org.apache.parquet', getJavaRelocatedPath('org.apache.parquet')
+    relocate 'com.google.common', getJavaRelocatedPath('iceberg.hive.com.google.common')
+    relocate 'com.google.protobuf', getJavaRelocatedPath('iceberg.hive.com.google.protobuf')
+    relocate 'shaded.parquet', getJavaRelocatedPath('iceberg.hive.shaded.parquet')
+    relocate 'org.apache.parquet', getJavaRelocatedPath('iceberg.hive.org.apache.parquet')
 
     version "3.1.3"
     mergeServiceFiles()