From e175ca0179e95d949fdae822c04c85727de4855d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Nov 2022 15:50:08 +0100 Subject: [PATCH] fix(deps): update iceberg to v1.1.0 (#5582) * fix(deps): update iceberg to v1.1.0 * add missing deps * Bump Nessie client for Iceberg to 0.44.0, #4307 changed method signatures * CI/integreations: stop Gradle daemon to prevent OOM in last step Similar to the change https://github.com/projectnessie/query-engine-integration-tests/pull/67 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Robert Stupp --- .github/workflows/pull-request-integ.yml | 5 +++++ gc/gc-iceberg-files/build.gradle.kts | 1 + gc/gc-iceberg-inttest/build.gradle.kts | 1 + gc/gc-tool-inttest/build.gradle.kts | 1 + gradle/libs.versions.toml | 5 +++-- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-integ.yml b/.github/workflows/pull-request-integ.yml index 0ee09a41de2..a71d4f2cc2a 100644 --- a/.github/workflows/pull-request-integ.yml +++ b/.github/workflows/pull-request-integ.yml @@ -106,6 +106,11 @@ jobs: with: arguments: :nessie-iceberg:nessie-spark-extensions-3.3_2.12:test :nessie-iceberg:nessie-spark-extensions-3.3_2.12:intTest + - name: Stop Gradle daemon + uses: gradle/gradle-build-action@v2 + with: + arguments: --stop + - name: Publish Nessie + Iceberg to local Maven repo uses: gradle/gradle-build-action@v2 with: diff --git a/gc/gc-iceberg-files/build.gradle.kts b/gc/gc-iceberg-files/build.gradle.kts index 499147561a5..f16be6b4a55 100644 --- a/gc/gc-iceberg-files/build.gradle.kts +++ b/gc/gc-iceberg-files/build.gradle.kts @@ -69,6 +69,7 @@ dependencies { testImplementation(platform(libs.awssdk.bom)) testImplementation(libs.awssdk.s3) + testRuntimeOnly(libs.awssdk.sts) testRuntimeOnly(libs.hadoop.aws) testImplementation(platform(libs.junit.bom)) diff --git a/gc/gc-iceberg-inttest/build.gradle.kts b/gc/gc-iceberg-inttest/build.gradle.kts index 6b02396469f..6721e6a2846 100644 --- a/gc/gc-iceberg-inttest/build.gradle.kts +++ b/gc/gc-iceberg-inttest/build.gradle.kts @@ -75,6 +75,7 @@ dependencies { testRuntimeOnly(libs.hadoop.client) testRuntimeOnly(libs.hadoop.aws) + testRuntimeOnly(libs.awssdk.sts) testImplementation(platform(libs.awssdk.bom)) testImplementation(libs.awssdk.s3) diff --git a/gc/gc-tool-inttest/build.gradle.kts b/gc/gc-tool-inttest/build.gradle.kts index d44a788fb90..10ffd8083ec 100644 --- a/gc/gc-tool-inttest/build.gradle.kts +++ b/gc/gc-tool-inttest/build.gradle.kts @@ -82,6 +82,7 @@ dependencies { testRuntimeOnly(libs.hadoop.client) testRuntimeOnly(libs.hadoop.aws) + testRuntimeOnly(libs.awssdk.sts) testRuntimeOnly(platform(libs.awssdk.bom)) testRuntimeOnly(libs.awssdk.s3) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 09522495064..dea44b4ff20 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ gatling = "3.8.4" googleJavaFormat = "1.15.0" guava = "31.1-jre" hadoop = "3.3.4" -iceberg = "1.0.0" +iceberg = "1.1.0" immutables = "2.9.2" jacoco = "0.8.8" jandex = "3.0.4" @@ -22,7 +22,7 @@ maven = "3.8.6" mavenResolver = "1.7.3" micrometer = "1.10.2" nessieBuildPlugins = "0.2.14" -nessieClientVersion = "0.30.0" +nessieClientVersion = "0.44.0" opentracing = "0.33.0" parquet = "1.12.3" picocli = "4.7.0" @@ -87,6 +87,7 @@ awssdk-glue = { module = "software.amazon.awssdk:glue" } awssdk-kms = { module = "software.amazon.awssdk:kms" } awssdk-netty-nio-client = { module = "software.amazon.awssdk:netty-nio-client" } awssdk-s3 = { module = "software.amazon.awssdk:s3" } +awssdk-sts = { module = "software.amazon.awssdk:sts" } awssdk-url-connection-client = { module = "software.amazon.awssdk:url-connection-client" } bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastle" } bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" }