You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by pv...@apache.org on 2021/12/07 15:00:33 UTC

[iceberg] branch master updated: Spark: Remove iceberg-hive-metastore compile time dependency (#3627)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2397d2e  Spark: Remove iceberg-hive-metastore compile time dependency (#3627)
2397d2e is described below

commit 2397d2e91a3a791b58181bd40b973ddc601d6010
Author: pvary <pv...@cloudera.com>
AuthorDate: Tue Dec 7 16:00:15 2021 +0100

    Spark: Remove iceberg-hive-metastore compile time dependency (#3627)
---
 spark/v2.4/build.gradle | 3 ++-
 spark/v3.0/build.gradle | 5 +++--
 spark/v3.1/build.gradle | 5 +++--
 spark/v3.2/build.gradle | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/spark/v2.4/build.gradle b/spark/v2.4/build.gradle
index 22f4abb..b961f79 100644
--- a/spark/v2.4/build.gradle
+++ b/spark/v2.4/build.gradle
@@ -58,7 +58,6 @@ project(':iceberg-spark:iceberg-spark2') {
     implementation project(':iceberg-orc')
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-arrow')
-    implementation project(':iceberg-hive-metastore')
     implementation "com.github.ben-manes.caffeine:caffeine"
 
     compileOnly "com.google.errorprone:error_prone_annotations"
@@ -85,6 +84,7 @@ project(':iceberg-spark:iceberg-spark2') {
     testImplementation("org.apache.hadoop:hadoop-minicluster") {
       exclude group: 'org.apache.avro', module: 'avro'
     }
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
@@ -127,6 +127,7 @@ project(':iceberg-spark:iceberg-spark-runtime') {
   dependencies {
     implementation project(':iceberg-spark:iceberg-spark2')
     implementation project(':iceberg-aws')
+    implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
diff --git a/spark/v3.0/build.gradle b/spark/v3.0/build.gradle
index 2ad0fb0..7da0fe7 100644
--- a/spark/v3.0/build.gradle
+++ b/spark/v3.0/build.gradle
@@ -57,7 +57,6 @@ project(':iceberg-spark:iceberg-spark3') {
     implementation project(':iceberg-orc')
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-arrow')
-    implementation project(':iceberg-hive-metastore')
 
     compileOnly "com.google.errorprone:error_prone_annotations"
     compileOnly "org.apache.avro:avro"
@@ -84,6 +83,7 @@ project(':iceberg-spark:iceberg-spark3') {
     testImplementation("org.apache.hadoop:hadoop-minicluster") {
       exclude group: 'org.apache.avro', module: 'avro'
     }
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
@@ -131,13 +131,13 @@ project(":iceberg-spark:iceberg-spark3-extensions") {
     compileOnly project(':iceberg-orc')
     compileOnly project(':iceberg-common')
     compileOnly project(':iceberg-spark:iceberg-spark3')
-    compileOnly project(':iceberg-hive-metastore')
     compileOnly("org.apache.spark:spark-hive_2.12:${sparkVersion}") {
       exclude group: 'org.apache.avro', module: 'avro'
       exclude group: 'org.apache.arrow'
       exclude group: 'org.roaringbitmap'
     }
 
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
 
     testImplementation project(path: ':iceberg-data', configuration: 'testArtifacts')
@@ -197,6 +197,7 @@ project(':iceberg-spark:iceberg-spark3-runtime') {
     implementation project(':iceberg-spark:iceberg-spark3')
     implementation project(':iceberg-spark:iceberg-spark3-extensions')
     implementation project(':iceberg-aws')
+    implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
diff --git a/spark/v3.1/build.gradle b/spark/v3.1/build.gradle
index 0049464..7e57560 100644
--- a/spark/v3.1/build.gradle
+++ b/spark/v3.1/build.gradle
@@ -57,7 +57,6 @@ project(':iceberg-spark:iceberg-spark-3.1_2.12') {
     implementation project(':iceberg-orc')
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-arrow')
-    implementation project(':iceberg-hive-metastore')
 
     compileOnly "com.google.errorprone:error_prone_annotations"
     compileOnly "org.apache.avro:avro"
@@ -84,6 +83,7 @@ project(':iceberg-spark:iceberg-spark-3.1_2.12') {
     testImplementation("org.apache.hadoop:hadoop-minicluster") {
       exclude group: 'org.apache.avro', module: 'avro'
     }
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
@@ -131,13 +131,13 @@ project(":iceberg-spark:iceberg-spark-extensions-3.1_2.12") {
     compileOnly project(':iceberg-orc')
     compileOnly project(':iceberg-common')
     compileOnly project(':iceberg-spark:iceberg-spark-3.1_2.12')
-    compileOnly project(':iceberg-hive-metastore')
     compileOnly("org.apache.spark:spark-hive_2.12:${sparkVersion}") {
       exclude group: 'org.apache.avro', module: 'avro'
       exclude group: 'org.apache.arrow'
       exclude group: 'org.roaringbitmap'
     }
 
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
 
     testImplementation project(path: ':iceberg-data', configuration: 'testArtifacts')
@@ -197,6 +197,7 @@ project(':iceberg-spark:iceberg-spark-runtime-3.1_2.12') {
     implementation project(':iceberg-spark:iceberg-spark-3.1_2.12')
     implementation project(':iceberg-spark:iceberg-spark-extensions-3.1_2.12')
     implementation project(':iceberg-aws')
+    implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
diff --git a/spark/v3.2/build.gradle b/spark/v3.2/build.gradle
index 01b8bf3..5d14ef6 100644
--- a/spark/v3.2/build.gradle
+++ b/spark/v3.2/build.gradle
@@ -57,7 +57,6 @@ project(':iceberg-spark:iceberg-spark-3.2_2.12') {
     implementation project(':iceberg-orc')
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-arrow')
-    implementation project(':iceberg-hive-metastore')
 
     compileOnly "com.google.errorprone:error_prone_annotations"
     compileOnly "org.apache.avro:avro"
@@ -88,6 +87,7 @@ project(':iceberg-spark:iceberg-spark-3.2_2.12') {
       // to make sure io.netty.buffer only comes from project(':iceberg-arrow')
       exclude group: 'io.netty', module: 'netty-buffer'
     }
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
     testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
@@ -133,7 +133,6 @@ project(":iceberg-spark:iceberg-spark-extensions-3.2_2.12") {
     compileOnly project(':iceberg-core')
     compileOnly project(':iceberg-common')
     compileOnly project(':iceberg-spark:iceberg-spark-3.2_2.12')
-    compileOnly project(':iceberg-hive-metastore')
     compileOnly("org.apache.spark:spark-hive_2.12:${sparkVersion}") {
       exclude group: 'org.apache.avro', module: 'avro'
       exclude group: 'org.apache.arrow'
@@ -142,6 +141,7 @@ project(":iceberg-spark:iceberg-spark-extensions-3.2_2.12") {
       exclude group: 'org.roaringbitmap'
     }
 
+    testImplementation project(path: ':iceberg-hive-metastore')
     testImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
 
     testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
@@ -199,6 +199,7 @@ project(':iceberg-spark:iceberg-spark-runtime-3.2_2.12') {
     implementation project(':iceberg-spark:iceberg-spark-3.2_2.12')
     implementation project(':iceberg-spark:iceberg-spark-extensions-3.2_2.12')
     implementation project(':iceberg-aws')
+    implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }