From fe81a388154a93cdf71e363bb408cf0990dd7780 Mon Sep 17 00:00:00 2001 From: Ahmed Abualsaud Date: Thu, 29 Aug 2024 15:45:56 -0400 Subject: [PATCH] Cherrypick 32363 --- 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()