Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Download BQMS catalog jar at build time" #32327

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/trigger_files/IO_Iceberg_Integration_Tests.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run",
"modification": 7
"modification": 6
}
Binary file not shown.
23 changes: 2 additions & 21 deletions sdks/java/io/iceberg/bigquerymetastore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Loading