This is an automated email from the ASF dual-hosted git repository. ahmedabualsaud pushed a commit to branch revert-32282-bqms_fix in repository https://gitbox.apache.org/repos/asf/beam.git
commit d896aeadbb3e3c863b01749994c3f7403d1c71c0 Author: Ahmed Abualsaud <[email protected]> AuthorDate: Tue Aug 27 11:06:23 2024 -0400 Revert "download BQMS catalog jar at build time (#32282)" This reverts commit ebf80f326b2f0c137b32372456170ad6b6c43e88. --- .../IO_Iceberg_Integration_Tests.json | 2 +- .../iceberg-bigquery-catalog-1.5.2-0.1.0.jar | Bin 0 -> 3598768 bytes .../java/io/iceberg/bigquerymetastore/build.gradle | 23 ++------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.github/trigger_files/IO_Iceberg_Integration_Tests.json b/.github/trigger_files/IO_Iceberg_Integration_Tests.json index 5cf4f475f31..a84f69a9772 100644 --- 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": 7 + "modification": 6 } diff --git a/sdks/java/io/iceberg/bigquerymetastore/bqms-catalog/iceberg-bigquery-catalog-1.5.2-0.1.0.jar b/sdks/java/io/iceberg/bigquerymetastore/bqms-catalog/iceberg-bigquery-catalog-1.5.2-0.1.0.jar new file mode 100644 index 00000000000..62f6e7e0a72 Binary files /dev/null and b/sdks/java/io/iceberg/bigquerymetastore/bqms-catalog/iceberg-bigquery-catalog-1.5.2-0.1.0.jar differ diff --git a/sdks/java/io/iceberg/bigquerymetastore/build.gradle b/sdks/java/io/iceberg/bigquerymetastore/build.gradle index 20e4a33b09f..582966b65f1 100644 --- a/sdks/java/io/iceberg/bigquerymetastore/build.gradle +++ b/sdks/java/io/iceberg/bigquerymetastore/build.gradle @@ -19,38 +19,19 @@ plugins { id 'org.apache.beam.module' } -def bqmsLocation = "$buildDir/libs" - applyJavaNature( automaticModuleName: 'org.apache.beam.sdk.io.iceberg.bqms', shadowClosure: { dependencies { - include(dependency(files("$bqmsLocation/iceberg-bigquery-catalog-1.5.2-0.1.0.jar"))) + include(dependency(files("bqms-catalog/iceberg-bigquery-catalog-1.5.2-0.1.0.jar"))) } relocate 'com.google.guava', getJavaRelocatedPath('iceberg.bqms.com.google.guava') }, - validateShadowJar: false ) description = "Apache Beam :: SDKs :: Java :: IO :: Iceberg :: BigQuery Metastore" ext.summary = "A copy of the BQMS catalog with some popular libraries relocated." -task downloadBqmsJar(type: Copy) { - def jarUrl = 'https://storage.googleapis.com/spark-lib/bigquery/iceberg-bigquery-catalog-1.5.2-0.1.0.jar' - def outputDir = file("$bqmsLocation") - outputDir.mkdirs() - - ant.get(src: jarUrl, dest: outputDir) -} - -repositories { - flatDir { - dirs "$bqmsLocation" - } -} - -compileJava.dependsOn downloadBqmsJar - dependencies { - implementation files("$bqmsLocation/iceberg-bigquery-catalog-1.5.2-0.1.0.jar") + implementation files("bqms-catalog/iceberg-bigquery-catalog-1.5.2-0.1.0.jar") }
