From 354a331d4669300ab76422d4ca3557ae305feba4 Mon Sep 17 00:00:00 2001 From: Sanket Sahu Date: Mon, 16 Nov 2026 10:30:46 +0000 Subject: [PATCH 1/2] [cherrypick] Upgrade Bigtable HBase client to 2.x to remove shaded Hadoop 2.7.4. hbase-shaded-client and hbase-shaded-server 1.4.13 bundle hadoop-common 2.7.4 and hadoop-yarn-server-common 2.7.4 inside their shaded JARs, triggering 6 S1 Hadoop 2.x CVEs even when hadoop.version is 3.3.6. Move to bigtable-hbase-2.x-hadoop 2.18.3 and hbase-shaded-mapreduce 2.6.6-hadoop3 (with org.apache.hadoop transitive dependencies excluded). hbase-shaded-mapreduce 2.6.6-hadoop3 is compiled for Java 8 (class version 52.0), keeps HBase's internal protobuf 2.5.0 shaded away from the Datastore plugin, provides all HBase client, mapreduce, and token classes, and does not bundle Hadoop classes so the CDAP platform Hadoop 3.3.6 is used at runtime. --- pom.xml | 64 +++++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index 996f5880a..0913e0fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ io.cdap.plugin google-cloud - 0.24.7 + 0.24.8-SNAPSHOT Google Cloud Plugins jar Plugins for Google Big Query @@ -66,7 +66,7 @@ 3.2.6 0.7.1 hadoop3-2.2.21 - 1.17.1 + 2.18.3 1.137.1 2.0.2 1.108.1 @@ -78,8 +78,7 @@ 1.3.0-rc3 27.0.1-jre 3.3.6 - 1.4.13 - 1.4.13 + 2.6.6-hadoop3 4.5.13 2.13.4.2 4.13.1 @@ -351,27 +350,12 @@ com.google.cloud.bigtable - bigtable-hbase-1.x-mapreduce + bigtable-hbase-2.x-hadoop ${google.cloud.bigtable.version} org.apache.hbase - hbase-client - - - org.apache.hbase - hbase-server - - - org.apache.hbase - hbase-annotations - - - - org.apache.hbase - hbase-common + * org.apache.hadoop @@ -461,38 +445,18 @@ org.apache.hbase - hbase-shaded-client - ${hbase-shaded-client.version} + hbase-shaded-mapreduce + ${hbase-shaded-mapreduce.version} - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - org.apache.htrace - htrace-core + org.apache.hadoop + * - - - - - org.apache.hbase - hbase-shaded-server - ${hbase-shaded-server.version} - org.slf4j slf4j-log4j12 @@ -505,10 +469,6 @@ org.apache.htrace htrace-core - - org.apache.hadoop - hadoop-common - From c34d8593afdaf99c53e9e62acb6ed7ed1a36061a Mon Sep 17 00:00:00 2001 From: vishwasvaidya-cloudsufi Date: Thu, 19 Nov 2026 06:18:42 +0000 Subject: [PATCH 2/2] Add perfmark-api at compile scope to fix gRPC runtime NoClassDefFoundError --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 0913e0fe8..ff742ade0 100644 --- a/pom.xml +++ b/pom.xml @@ -861,6 +861,13 @@ proto-google-common-protos 2.8.3 + + + io.perfmark + perfmark-api + 0.23.0 +