From 221582b4707236e23283c94d514a3cf504cf9adc Mon Sep 17 00:00:00 2001 From: David Rabinowitz Date: Thu, 19 Nov 2026 16:56:57 -0800 Subject: [PATCH 1/2] deps: override guava, jackson-core and opentelemetry in shaded jars to fix CVEs The bigtable-hbase-1.x/2.x-shaded jars, and the -hadoop jars built from them, bundle relocated copies of libraries resolved through google-cloud-bigtable 2.85.0. An OSV scan of the artifacts bundled into bigtable-hbase-2.x-hadoop flagged three of them: - guava 33.6.0-jre: CVE-2026-102554 - jackson-core 2.18.3: CVE-2026-18401, CVE-2026-68494, CVE-2026-89407, CVE-2026-89425 - opentelemetry-api 1.62.0: CVE-2026-118259 Manage them up to patched releases: guava 33.7.2-jre, jackson-core 2.18.12 and opentelemetry 1.67.0. OSV reports no known vulnerabilities for these versions. Bumping the veneer is not enough. google-cloud-bigtable 2.88.0, the latest release, only picks up a fixed jackson-core and still resolves the vulnerable guava and opentelemetry versions. The versions are properties in the root pom, but the dependencyManagement entries live in the two shaded modules rather than the root. Root-level pins would apply to every module, trip the verify-mirror-deps checks that compare modules against hbase and the veneer, and could downgrade jackson-core in the Beam modules. Scoping the overrides to the modules that bundle these libraries keeps the rest of the build aligned with its upstream BOMs. Every opentelemetry artifact the veneer uses is listed, not just the API, because the SDK must not be older than the API. The overridden artifacts are added to the ignore list of the veneer mirror check in both shaded modules, since they now differ from the veneer on purpose. guava.version was previously 33.4.0-jre and is also used by bigtable-hbase-mirroring-client-core, which moves to 33.7.2-jre as well. This covers only what is bundled in the jars. The unshaded transitive dependencies of hbase-client 2.6.4-hadoop3 that bigtable-hbase-2.x-hadoop declares (netty, zookeeper, jackson-databind, bouncycastle and others) are unchanged. Each override can be removed once the veneer's deps-bom ships the same or a newer version. --- .../bigtable-hbase-1.x-shaded/pom.xml | 77 +++++++++++++++++++ .../bigtable-hbase-2.x-shaded/pom.xml | 77 +++++++++++++++++++ pom.xml | 12 ++- 3 files changed, 164 insertions(+), 2 deletions(-) diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml index 60c561126b..544a359388 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml @@ -85,6 +85,68 @@ limitations under the License. 3.0.2 provided + + + + com.google.guava + guava + ${guava.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-core.version} + + + io.opentelemetry + opentelemetry-api + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-context + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-common + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-common + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-metrics + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-trace + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-logs + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure-spi + ${opentelemetry.version} + @@ -456,6 +518,21 @@ limitations under the License. com.google.cloud:google-cloud-bigtable + + + com.google.guava:guava + com.fasterxml.jackson.core:jackson-core + io.opentelemetry:opentelemetry-api + io.opentelemetry:opentelemetry-context + io.opentelemetry:opentelemetry-common + io.opentelemetry:opentelemetry-sdk + io.opentelemetry:opentelemetry-sdk-common + io.opentelemetry:opentelemetry-sdk-metrics + io.opentelemetry:opentelemetry-sdk-trace + io.opentelemetry:opentelemetry-sdk-logs + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi + diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml index 23fdb9564e..d108ccb073 100644 --- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml +++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml @@ -85,6 +85,68 @@ limitations under the License. 3.0.2 provided + + + + com.google.guava + guava + ${guava.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-core.version} + + + io.opentelemetry + opentelemetry-api + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-context + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-common + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-common + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-metrics + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-trace + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-logs + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure-spi + ${opentelemetry.version} + @@ -454,6 +516,21 @@ limitations under the License. com.google.cloud:google-cloud-bigtable + + + com.google.guava:guava + com.fasterxml.jackson.core:jackson-core + io.opentelemetry:opentelemetry-api + io.opentelemetry:opentelemetry-context + io.opentelemetry:opentelemetry-common + io.opentelemetry:opentelemetry-sdk + io.opentelemetry:opentelemetry-sdk-common + io.opentelemetry:opentelemetry-sdk-metrics + io.opentelemetry:opentelemetry-sdk-trace + io.opentelemetry:opentelemetry-sdk-logs + io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi + diff --git a/pom.xml b/pom.xml index 0320b2f88b..e5956cfa77 100644 --- a/pom.xml +++ b/pom.xml @@ -85,10 +85,18 @@ limitations under the License. 1.3 4.11.0 2.77.0 - - 33.4.0-jre 0.31.1 + + 33.7.2-jre + 2.18.12 + 1.67.0 + false From d15c0874290d3bd84311bb1449f8f62c9d4cbe81 Mon Sep 17 00:00:00 2001 From: David Rabinowitz Date: Thu, 19 Nov 2026 20:30:33 -0800 Subject: [PATCH 2/2] fix: relocate jspecify in mirroring-client shaded jars The previous commit raised guava.version from 33.4.0-jre to 33.7.2-jre to pick up the fix for CVE-2026-102554. That property is also used by bigtable-hbase-mirroring-client-core, so the mirroring-client shaded jars now bundle the newer Guava as well. Guava 33.7.2-jre depends on org.jspecify:jspecify instead of checker-qual. The mirroring-client shaded jars only relocated org.checkerframework, so the jspecify annotation classes landed in the jar under their original package and verify-shaded-jar-entries failed the build of bigtable-hbase-mirroring-client-1.x-shaded: Found forbidden entries in the shaded jar: org/jspecify/annotations/NonNull.class org/jspecify/annotations/NullMarked.class org/jspecify/annotations/NullUnmarked.class org/jspecify/annotations/Nullable.class Relocate org.jspecify under the shading prefix, next to the existing org.checkerframework relocation. The 2.x shaded module has the same relocation set and bundles the same Guava, so it gets the same change. Relocating was chosen over pinning these modules back to Guava 33.4.0-jre, which would have kept the vulnerable release in the mirroring-client jars. --- .../bigtable-hbase-mirroring-client-1.x-shaded/pom.xml | 5 +++++ .../bigtable-hbase-mirroring-client-2.x-shaded/pom.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml index 60a199fae0..1906c860bd 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-1.x-parent/bigtable-hbase-mirroring-client-1.x-shaded/pom.xml @@ -146,6 +146,11 @@ limitations under the License. org.checkerframework ${shading-prefix}.org.checkerframework + + + org.jspecify + ${shading-prefix}.org.jspecify + javax.annotation ${shading-prefix}.javax.annotation diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml index aece20b5d9..82b5a0a4ee 100644 --- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml +++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-2.x-parent/bigtable-hbase-mirroring-client-2.x-shaded/pom.xml @@ -135,6 +135,11 @@ limitations under the License. org.checkerframework ${shading-prefix}.org.checkerframework + + + org.jspecify + ${shading-prefix}.org.jspecify + javax.annotation ${shading-prefix}.javax.annotation