Relocate guava in shaded hive-exec (#32363)

* relocate guava in shaded hive exec * trigger iceberg integration tests * cleanup
apache · Aug 29, 2024 · df83fbd · df83fbd
1 parent bcee5d0
commit df83fbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/trigger_files/IO_Iceberg_Integration_Tests.json b/.github/trigger_files/IO_Iceberg_Integration_Tests.json
@@ -1,4 +1,4 @@
 {
     "comment": "Modify this file in a trivial way to cause this test suite to run",
-    "modification": 7
+    "modification": 8
 }
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()