Temporarily remove BQMS catalog until it is opend-sourced (#32386)

apache · Aug 31, 2024 · e18596c · e18596c
1 parent 511f294
commit e18596c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 341 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": 8
+    "modification": 1
 }
diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle
@@ -52,8 +52,6 @@ dependencies {
   // Needed for HiveCatalog
   runtimeOnly ("org.apache.iceberg:iceberg-hive-metastore:1.4.2")
   runtimeOnly project(path: ":sdks:java:io:iceberg:hive:exec", configuration: "shadow")
-  // Needed for BigQuery Metastore catalog (this isn't supported for java 8)
-  runtimeOnly project(path: ":sdks:java:io:iceberg:bigquerymetastore", configuration: "shadow")
 
   runtimeOnly library.java.kafka_clients
   runtimeOnly library.java.slf4j_jdk14

diff --git a/sdks/java/io/iceberg/bigquerymetastore/build.gradle b/sdks/java/io/iceberg/bigquerymetastore/build.gradle
diff --git a/sdks/java/io/iceberg/build.gradle b/sdks/java/io/iceberg/build.gradle
@@ -55,7 +55,6 @@ dependencies {
     implementation "org.apache.iceberg:iceberg-orc:$iceberg_version"
     implementation library.java.hadoop_common
 
-    testImplementation project(path: ":sdks:java:io:iceberg:bigquerymetastore", configuration: "shadow")
     testImplementation library.java.hadoop_client
     testImplementation library.java.bigdataoss_gcsio
     testImplementation library.java.bigdataoss_gcs_connector
@@ -110,11 +109,6 @@ task integrationTest(type: Test) {
     outputs.upToDateWhen { false }
 
     include '**/*IT.class'
-    // BQ metastore catalog doesn't support java 8
-    if (project.findProperty('testJavaVersion') == '8' ||
-            JavaVersion.current().equals(JavaVersion.VERSION_1_8)) {
-        exclude '**/BigQueryMetastoreCatalogIT.class'
-    }
 
     maxParallelForks 4
     classpath = sourceSets.test.runtimeClasspath

diff --git a/...a/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/BigQueryMetastoreCatalogIT.java b/...a/io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/BigQueryMetastoreCatalogIT.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -369,5 +369,3 @@ include("sdks:java:io:iceberg:hive")
 findProject(":sdks:java:io:iceberg:hive")?.name = "hive"
 include("sdks:java:io:iceberg:hive:exec")
 findProject(":sdks:java:io:iceberg:hive:exec")?.name = "exec"
-include("sdks:java:io:iceberg:bigquerymetastore")
-findProject(":sdks:java:io:iceberg:bigquerymetastore")?.name = "bigquerymetastore"