Cherrypick 32363 (#32368)

apache · Sep 4, 2024 · 29a16a0 · 29a16a0
1 parent 37d41fd
commit 29a16a0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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()