diff --git a/.github/trivyignore/kafka-connect-runtime.trivyignore b/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml similarity index 66% rename from .github/trivyignore/kafka-connect-runtime.trivyignore rename to .github/trivyignore/kafka-connect-runtime.trivyignore.yaml index 84bfcc2ffb7e..03ed0029a925 100644 --- a/.github/trivyignore/kafka-connect-runtime.trivyignore +++ b/.github/trivyignore/kafka-connect-runtime.trivyignore.yaml @@ -24,10 +24,24 @@ # upgraded independently of Apache Parquet, and 1.17.1 still bundles # vulnerable versions. # +vulnerabilities: # jackson-databind CVEs shaded into parquet-jackson, only fixed in jackson # >= 2.21.4 / 2.18.8. -CVE-2026-54512 -CVE-2026-54513 +- id: CVE-2026-54512 +- id: CVE-2026-54513 # jackson-core CVE shaded into parquet-jackson, only fixed in jackson # >= 2.18.8 / 2.21.4 / 2.22.1. -GHSA-r7wm-3cxj-wff9 +- id: CVE-2026-68494 +# jackson-databind CVE shaded into parquet-jackson 1.17.1, only fixed in +# jackson >= 2.18.10 / 2.21.6 / 2.22.2. Resolved once Apache Parquet is +# bumped to 1.18.1 (apache/iceberg#17321). +- id: CVE-2026-68497 +# jackson-databind CVEs shaded into parquet-jackson 1.17.1, only fixed in +# jackson >= 2.18.11 / 2.21.7 / 2.22.3. Resolved once Apache Parquet is +# bumped to 1.18.1 (apache/iceberg#17321). +- 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. +- id: CVE-2026-89407 +- id: CVE-2026-89425 diff --git a/.github/workflows/cve-scan.yml b/.github/workflows/cve-scan.yml index abfad430bbd2..5bc6b814a4c3 100644 --- a/.github/workflows/cve-scan.yml +++ b/.github/workflows/cve-scan.yml @@ -116,7 +116,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/build.gradle b/build.gradle index 103d5aef1610..07e3dd73fa4c 100644 --- a/build.gradle +++ b/build.gradle @@ -1140,6 +1140,7 @@ project(':iceberg-open-api') { exclude group: 'commons-cli', module: 'commons-cli' exclude group: 'com.github.pjfanning', module: 'jersey-json' } + testFixturesRuntimeOnly 'org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.6.0' testFixturesImplementation project(path: ':iceberg-bundled-guava', configuration: 'shadow') testFixturesImplementation libs.junit.jupiter diff --git a/gcp-bundle/build.gradle b/gcp-bundle/build.gradle index 509aa019271c..5073d0463c7e 100644 --- a/gcp-bundle/build.gradle +++ b/gcp-bundle/build.gradle @@ -35,6 +35,9 @@ 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" implementation "com.google.cloud:google-cloud-core" diff --git a/gcp-bundle/runtime-deps.txt b/gcp-bundle/runtime-deps.txt index 8ef5630bd126..4bb79bccd688 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/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2004e3a1645f..d2585d8fad7c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,15 +54,15 @@ flink22 = { strictly = "2.2.0"} flink23 = { strictly = "2.3.0"} google-libraries-bom = "26.88.1" gcs-analytics-core = "1.5.0" -guava = "33.7.1-jre" +guava = "33.7.2-jre" hadoop3 = "3.4.3" httpcomponents-httpclient5 = "5.6.4" hive2 = { strictly = "2.3.10"} # see rich version usage explanation above immutables-value = "2.12.2" jackson-annotations = "2.22" -jackson-bom = "2.22.2" -jackson218 = { strictly = "2.18.8"} -jackson221 = { strictly = "2.21.4"} +jackson-bom = "2.22.4" +jackson218 = { strictly = "2.18.11"} +jackson221 = { strictly = "2.21.7"} jakarta-el-api = "3.0.3" jakarta-servlet-api = "6.1.0" jaxb-api = "2.3.1" diff --git a/kafka-connect/build.gradle b/kafka-connect/build.gradle index 090ddb549e82..94b39d4863ca 100644 --- a/kafka-connect/build.gradle +++ b/kafka-connect/build.gradle @@ -76,12 +76,13 @@ project(':iceberg-kafka-connect:iceberg-kafka-connect-runtime') { // force upgrades for dependencies with known vulnerabilities... resolutionStrategy { force 'org.codehaus.jettison:jettison:1.5.7' - force 'org.xerial.snappy:snappy-java:1.1.10.8' + force 'org.xerial.snappy:snappy-java:1.1.10.12' force 'org.apache.commons:commons-compress:1.28.0' - force 'org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0' + force 'org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.6.0' force 'com.fasterxml.woodstox:woodstox-core:6.7.0' force 'commons-beanutils:commons-beanutils:1.11.0' force 'io.grpc:grpc-netty-shaded:1.84.0' + force 'com.fasterxml.jackson.core:jackson-databind:2.22.4' } } } @@ -136,6 +137,8 @@ project(':iceberg-kafka-connect:iceberg-kafka-connect-runtime') { implementation project(':iceberg-gcp') implementation project(':iceberg-bigquery') implementation platform(libs.google.libraries.bom) + // Align 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' implementation 'com.google.cloud:google-cloud-core' diff --git a/kafka-connect/kafka-connect-runtime/runtime-deps.txt b/kafka-connect/kafka-connect-runtime/runtime-deps.txt index 39f57c5594f3..b6d0753b9b61 100644 --- a/kafka-connect/kafka-connect-runtime/runtime-deps.txt +++ b/kafka-connect/kafka-connect-runtime/runtime-deps.txt @@ -56,7 +56,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 @@ -163,7 +163,7 @@ org.apache.commons:commons-compress:1.28 org.apache.commons:commons-lang3:3.18 org.apache.commons:commons-math3:3.6 org.apache.commons:commons-text:1.14 -org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5 +org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.6 org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25:1.5 org.apache.hadoop:hadoop-annotations:3.4 org.apache.hadoop:hadoop-common:3.4