[incubator-iceberg] branch master updated: Fix iceberg-spark-runtime transitive dependencies (#275)

[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 58c71e8  Fix iceberg-spark-runtime transitive dependencies (#275)
58c71e8 is described below

commit 58c71e899c4c5814794c2fda74872a3fff87261a
Author: Ryan Blue <rd...@users.noreply.github.com>
AuthorDate: Fri Jul 12 13:35:48 2019 -0700

    Fix iceberg-spark-runtime transitive dependencies (#275)
---
 build.gradle | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7fc7380..282ce61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -390,10 +390,6 @@ project(':iceberg-pig') {
 project(':iceberg-spark-runtime') {
   apply plugin: 'com.github.johnrengelman.shadow'
 
-  shadowJar {
-    from(project.sourceSets.main.output)
-  }
-
   tasks.build.dependsOn tasks.shadowJar
   tasks.install.dependsOn tasks.shadowJar
   tasks.javadocJar.dependsOn tasks.shadowJar
@@ -411,10 +407,13 @@ project(':iceberg-spark-runtime') {
   }
 
   dependencies {
-    compile project(':iceberg-spark')
+    compileOnly project(':iceberg-spark')
   }
 
   shadowJar {
+    // shade compileOnly dependencies to avoid including in transitive dependencies
+    configurations = [project.configurations.compileOnly]
+
     zip64 true
 
     // Relocate dependencies to avoid conflicts
@@ -428,7 +427,7 @@ project(':iceberg-spark-runtime') {
     relocate 'org.apache.parquet', 'org.apache.iceberg.shaded.org.apache.parquet'
     relocate 'shaded.parquet', 'org.apache.iceberg.shaded.org.apache.parquet.shaded'
     // relocate Avro's jackson dependency to share parquet-jackson locations
-    relocate 'org.codehaus.jackson', 'org.apache.iceberg.shaded.org.apache.parquet.shaded'
+    relocate 'org.codehaus.jackson', 'org.apache.iceberg.shaded.org.apache.parquet.shaded.org.codehaus.jackson'
     relocate 'org.apache.orc', 'org.apache.iceberg.shaded.org.apache.orc'
     relocate 'io.airlift', 'org.apache.iceberg.shaded.io.airlift'