[incubator-iceberg] branch master updated: Exclude transitive artifacts already part of orc-core fat jar (#265)

[bl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new 08e3f2d  Exclude transitive artifacts already part of orc-core fat jar (#265)
08e3f2d is described below

commit 08e3f2d2b0e4960410c4375084288604361cfda5
Author: Ratandeep Ratti <rr...@linkedin.com>
AuthorDate: Sun Jul 7 11:36:27 2019 -0700

    Exclude transitive artifacts already part of orc-core fat jar (#265)
---
 build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a6b5529..2619bfc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,6 +294,9 @@ project(':iceberg-orc') {
     compile("org.apache.orc:orc-core::nohive") {
       exclude group: 'org.apache.hadoop'
       exclude group: 'commons-lang'
+      // These artifacts are shaded and included in the orc-core fat jar
+      exclude group: 'com.google.protobuf', module: 'protobuf-java'
+      exclude group: 'org.apache.hive', module: 'hive-storage-api'
     }
 
     compileOnly("org.apache.hadoop:hadoop-client") {
@@ -415,8 +418,6 @@ project(':iceberg-spark-runtime') {
     relocate 'org.codehaus.jackson', 'org.apache.iceberg.shaded.org.apache.parquet.shaded'
     relocate 'org.apache.orc', 'org.apache.iceberg.shaded.org.apache.orc'
     relocate 'io.airlift', 'org.apache.iceberg.shaded.io.airlift'
-    relocate 'org.apache.hive', 'org.apache.iceberg.shaded.org.apache.hive'
-    relocate 'org.apache.hadoop.hive', 'org.apache.iceberg.shaded.org.apache.hadoop.hive'
 
     archiveName = "iceberg-spark-runtime-${version}.${extension}"
   }