From a67186b2751b94b382571e43386011effc927d65 Mon Sep 17 00:00:00 2001 From: Deepika Lalwani Date: Tue, 17 Nov 2026 06:16:09 +0000 Subject: [PATCH 1/2] Bump avro from 1.11.3 to 1.11.4 avro 1.11.3 and its commons-compress 1.22 are reported by image scanning of gcr.io/cdapio/cdap in /opt/cdap/master/artifacts/bigquery-delta-plugins-*.jar/lib/ (avro 1 row, commons-compress 3 rows). avro 1.11.4 is the fixed release on the Java 8 line and brings commons-compress 1.26.2. commons-compress 1.26.2 pulls commons-lang3 3.14.0 (CVE-2025-48924), so commons-lang3 is managed to the cross-track 3.18.0 in a new root dependencyManagement section. Versions: - avro 1.11.3 -> 1.11.4 (avro.version) - commons-compress 1.22 -> 1.26.2 (via avro); new commons-io 2.16.1 - commons-lang3 3.18.0 (managed; new transitive of commons-compress) - jackson-databind / jackson-annotations 2.14.2 -> 2.14.3 (avro 1.11.4 default; aligned to 2.18.12 in BQD-2) Bugs: b/578435797. Risk: low. Same-line avro patch release; no code change. Testing: JDK 8. mvn clean package: BUILD SUCCESS, Checkstyle 0 violations, 41 unit tests run, 0 failures, 3 skipped (skipped the same way on develop; the ERROR log lines are the retry paths that the BigQueryEventConsumer tests exercise on purpose). mvn dependency:tree -Dincludes=org.apache.avro,org.apache.commons,commons-io: avro 1.11.4 -> commons-compress 1.26.2 -> commons-io 2.16.1, commons-lang3 3.18.0; no avro 1.11.3 or commons-compress 1.22. unzip -l of the plugin jar vs develop: avro-1.11.4, commons-compress-1.26.2, commons-io-2.16.1, commons-lang3-3.18.0 replace avro-1.11.3 and commons-compress-1.22. --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d6c9142..2a8b8cb 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ - 1.11.3 + 1.11.4 1.133.1 6.4.0 0.9.0 @@ -80,6 +80,17 @@ + + + + + org.apache.commons + commons-lang3 + 3.18.0 + + + + io.cdap.cdap From ac57d9ab3b359abe5b3166bed82431a98c5ad82a Mon Sep 17 00:00:00 2001 From: Deepika Lalwani Date: Tue, 17 Nov 2026 06:22:16 +0000 Subject: [PATCH 2/2] Raise Jackson, protobuf and google-oauth-client floors google-cloud-bigquery 1.133.1 and google-cloud-storage 1.78.0 bring jackson-core 2.12.3, protobuf-java / protobuf-java-util 3.17.2 and google-oauth-client 1.31.5, and avro brings jackson-databind 2.14.x. Image scanning of gcr.io/cdapio/cdap reports these in /opt/cdap/master/artifacts/bigquery-delta-plugins-*.jar/lib/ (jackson-databind 11 rows, jackson-core 4, protobuf-java 4, google-oauth-client 1). The root dependencyManagement now imports jackson-bom 2.18.12 and protobuf-bom 3.25.5 and pins google-oauth-client 1.33.3. Upgrading the Google Cloud client libraries themselves is out of scope. Deviation from the plan line: google-oauth-client 1.33.3 is built against google-http-client 1.41.7 (the cross-track note says "with google-http-client 1.41.x"), so google-http-client-bom 1.41.7 is imported too; this moves the five google-http-client jars from 1.39.2 to 1.41.7. Versions: - jackson-core 2.12.3, jackson-databind / jackson-annotations 2.14.3 -> 2.18.12 (jackson-bom import, jackson.version) - protobuf-java, protobuf-java-util 3.17.2 -> 3.25.5 (protobuf-bom import, protobuf.version) - google-oauth-client 1.31.5 -> 1.33.3 (google-oauth-client.version) - google-http-client, -apache-v2, -appengine, -gson, -jackson2 1.39.2 -> 1.41.7 (google-http-client-bom import, google-http-client.version) Bugs: Plugins side done for the bigquery-delta jackson, protobuf and oauth-client rows (plan BQD-2: 20 bugs touched, 1 completed together with other tracks). Risk: medium. protobuf 3.25 runtime with 3.17-generated BigQuery protos, Jackson 2.15+ stream limits, and minor-version bumps of the Google HTTP / OAuth clients; all are backward compatible lines. Testing: JDK 8. mvn clean package: BUILD SUCCESS, Checkstyle 0 violations, 41 unit tests run, 0 failures, 3 skipped (as on develop). mvn dependency:tree -Dincludes=com.fasterxml.jackson.core,com.google.protobuf,com.google.oauth-client,com.google.http-client: only jackson 2.18.12, protobuf 3.25.5, google-oauth-client 1.33.3 and google-http-client* 1.41.7. unzip -l of the plugin jar vs BQD-1: only those jars changed. Not run: BigQuery / GCS integration (needs GCP credentials; wave smoke P4). --- pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pom.xml b/pom.xml index 2a8b8cb..c231888 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,10 @@ 6.4.0 0.9.0 2.3.3 + 2.18.12 + 3.25.5 + 1.33.3 + 1.41.7 1.78.0 1.2.3 2.0.9 @@ -82,6 +86,34 @@ + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${protobuf.version} + pom + import + + + + com.google.http-client + google-http-client-bom + ${google-http-client.version} + pom + import + + + com.google.oauth-client + google-oauth-client + ${google-oauth-client.version} + org.apache.commons