From b4ff9df52c86ea2887a145fb8b773733fc0b462e Mon Sep 17 00:00:00 2001 From: Manu Zhang Date: Wed, 28 Oct 2026 23:59:30 +0800 Subject: [PATCH 1/2] fix(build): align Guava in GCP and Kafka distributions Use the patched project Guava in cloud dependencies shared by the GCP bundle and Kafka distribution. Restrict the remaining upstream Hadoop shaded-Guava CVE exception to its exact artifact so other vulnerable Guava copies still fail scans. Generated-by: Codex Co-authored-by: Codex --- ...re => kafka-connect-runtime.trivyignore.yaml} | 16 ++++++++++++---- .github/workflows/cve-scan.yml | 2 +- gcp-bundle/build.gradle | 1 + gcp-bundle/runtime-deps.txt | 2 +- .../kafka-connect-runtime/runtime-deps.txt | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) rename .github/trivyignore/{kafka-connect-runtime.trivyignore => kafka-connect-runtime.trivyignore.yaml} (80%) diff --git a/.github/trivyignore/kafka-connect-runtime.trivyignore b/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml similarity index 80% rename from .github/trivyignore/kafka-connect-runtime.trivyignore rename to .github/trivyignore/kafka-connect-runtime.trivyignore.yaml index be1231813011..e9da9c38a6dd 100644 --- a/.github/trivyignore/kafka-connect-runtime.trivyignore +++ b/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml @@ -17,6 +17,14 @@ # # Trivy ignore file for the Kafka Connect runtime distribution. # +vulnerabilities: +- id: CVE-2026-102554 + paths: + - "**/hadoop-shaded-guava-1.5.0.jar" + statement: >- + Hadoop thirdparty 1.5.0 bundles Guava 33.4.8-jre and has no patched release. + Upgrade hadoop-shaded-guava when a release with Guava 33.7.2 or later is available. +# # The Kafka Connect runtime's own jackson-core / jackson-databind are already # aligned to the project version (2.22.x). The remaining findings come from # parquet-jackson, which ships its own shaded copy of jackson-core / @@ -26,9 +34,9 @@ # # jackson-databind CVEs shaded into parquet-jackson 1.18.1 (jackson 2.22.2), # only fixed in jackson >= 2.18.11 / 2.21.7 / 2.22.3. -CVE-2026-91776 -CVE-2026-91777 +- id: CVE-2026-91776 +- id: CVE-2026-91777 # jackson-core CVEs shaded into parquet-jackson 1.17.1, only fixed in jackson # >= 2.18.11 / 2.21.7 / 2.22.3. Apache Parquet 1.18.1 still bundles 2.22.2. -CVE-2026-89407 -CVE-2026-89425 +- id: CVE-2026-89407 +- id: CVE-2026-89425 diff --git a/.github/workflows/cve-scan.yml b/.github/workflows/cve-scan.yml index 3c07cf786e25..7039982cc10e 100644 --- a/.github/workflows/cve-scan.yml +++ b/.github/workflows/cve-scan.yml @@ -110,7 +110,7 @@ jobs: :iceberg-kafka-connect:iceberg-kafka-connect-runtime:distZip scan-path: kafka-connect/kafka-connect-runtime/build/distributions unpack: true - trivyignores: .github/trivyignore/kafka-connect-runtime.trivyignore + trivyignores: .github/trivyignore/kafka-connect-runtime.trivyignore.yaml - distribution: aws-bundle build-task: :iceberg-aws-bundle:shadowJar scan-path: aws-bundle/build/libs diff --git a/gcp-bundle/build.gradle b/gcp-bundle/build.gradle index 509aa019271c..2e0cabd30397 100644 --- a/gcp-bundle/build.gradle +++ b/gcp-bundle/build.gradle @@ -35,6 +35,7 @@ project(":iceberg-gcp-bundle") { // Align the shaded Jackson to the project version; the Google libraries BOM // otherwise pulls in an older jackson-databind with known CVEs. implementation platform(libs.jackson.bom) + implementation libs.guava.guava implementation "com.google.cloud:google-cloud-storage" implementation "com.google.cloud:google-cloud-bigquery" implementation "com.google.cloud:google-cloud-core" diff --git a/gcp-bundle/runtime-deps.txt b/gcp-bundle/runtime-deps.txt index d54c138bc91d..221c3f0f8f9d 100644 --- a/gcp-bundle/runtime-deps.txt +++ b/gcp-bundle/runtime-deps.txt @@ -49,7 +49,7 @@ com.google.code.gson:gson:2.14 com.google.errorprone:error_prone_annotations:2.50 com.google.flatbuffers:flatbuffers-java:24.3 com.google.guava:failureaccess:1.0 -com.google.guava:guava:33.6 +com.google.guava:guava:33.7 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.http-client:google-http-client-apache-v2:2.2 com.google.http-client:google-http-client-appengine:2.2 diff --git a/kafka-connect/kafka-connect-runtime/runtime-deps.txt b/kafka-connect/kafka-connect-runtime/runtime-deps.txt index a856e44482c3..eaa9880eb9fd 100644 --- a/kafka-connect/kafka-connect-runtime/runtime-deps.txt +++ b/kafka-connect/kafka-connect-runtime/runtime-deps.txt @@ -61,7 +61,7 @@ com.google.code.gson:gson:2.14 com.google.errorprone:error_prone_annotations:2.50 com.google.flatbuffers:flatbuffers-java:24.3 com.google.guava:failureaccess:1.0 -com.google.guava:guava:33.6 +com.google.guava:guava:33.7 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.http-client:google-http-client-apache-v2:2.2 com.google.http-client:google-http-client-appengine:2.2 From c9de693cd5d738ae6c721cb76a6e6f5bcc985924 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Wed, 28 Oct 2026 16:10:42 -0700 Subject: [PATCH 2/2] Build: Follow conventions for Guava override and CVE exception Use the existing BOM-alignment comment style for the GCP bundle Guava override, and document the hadoop-shaded-guava exception in the same format as the other shaded-dependency entries. Generated-by: GitHub Copilot (Claude Opus 5.5) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../kafka-connect-runtime.trivyignore.yaml | 14 ++++++-------- gcp-bundle/build.gradle | 2 ++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml b/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml index e9da9c38a6dd..b68db957cbea 100644 --- a/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml +++ b/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml @@ -17,14 +17,6 @@ # # Trivy ignore file for the Kafka Connect runtime distribution. # -vulnerabilities: -- id: CVE-2026-102554 - paths: - - "**/hadoop-shaded-guava-1.5.0.jar" - statement: >- - Hadoop thirdparty 1.5.0 bundles Guava 33.4.8-jre and has no patched release. - Upgrade hadoop-shaded-guava when a release with Guava 33.7.2 or later is available. -# # The Kafka Connect runtime's own jackson-core / jackson-databind are already # aligned to the project version (2.22.x). The remaining findings come from # parquet-jackson, which ships its own shaded copy of jackson-core / @@ -32,6 +24,7 @@ vulnerabilities: # upgraded independently of Apache Parquet, and 1.18.1 still bundles # vulnerable versions. # +vulnerabilities: # jackson-databind CVEs shaded into parquet-jackson 1.18.1 (jackson 2.22.2), # only fixed in jackson >= 2.18.11 / 2.21.7 / 2.22.3. - id: CVE-2026-91776 @@ -40,3 +33,8 @@ vulnerabilities: # >= 2.18.11 / 2.21.7 / 2.22.3. Apache Parquet 1.18.1 still bundles 2.22.2. - id: CVE-2026-89407 - id: CVE-2026-89425 +# guava CVE shaded into hadoop-shaded-guava 1.5.0 (guava 33.4.8), only fixed in +# guava >= 33.7.2. No newer hadoop-shaded-guava release exists yet. +- id: CVE-2026-102554 + paths: + - "**/hadoop-shaded-guava-1.5.0.jar" diff --git a/gcp-bundle/build.gradle b/gcp-bundle/build.gradle index 2e0cabd30397..5073d0463c7e 100644 --- a/gcp-bundle/build.gradle +++ b/gcp-bundle/build.gradle @@ -35,6 +35,8 @@ project(":iceberg-gcp-bundle") { // Align the shaded Jackson to the project version; the Google libraries BOM // otherwise pulls in an older jackson-databind with known CVEs. implementation platform(libs.jackson.bom) + // Align the shaded Guava to the project version; the Google libraries BOM + // otherwise pulls in an older Guava with known CVEs. implementation libs.guava.guava implementation "com.google.cloud:google-cloud-storage" implementation "com.google.cloud:google-cloud-bigquery"