From e022b252bb0c097820252b1366d08a79a519905a Mon Sep 17 00:00:00 2001 From: MV Shiva Prasad Date: Fri, 20 Mar 2026 15:39:34 +0530 Subject: [PATCH] Upgrade Dependencies --- MODULE.bazel | 38 +++++++++++------------ SECURITY.md | 3 +- examples/example-gauth/build.gradle | 2 +- examples/example-oauth/build.gradle | 2 +- gradle/libs.versions.toml | 48 ++++++++++++++--------------- repositories.bzl | 34 ++++++++++---------- 6 files changed, 64 insertions(+), 63 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 85c8b1aec13..c964c6dd712 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,14 +8,14 @@ module( # GRPC_DEPS_START IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.android:annotations:4.1.1.4", - "com.google.api.grpc:proto-google-common-protos:2.63.2", - "com.google.auth:google-auth-library-credentials:1.41.0", - "com.google.auth:google-auth-library-oauth2-http:1.41.0", + "com.google.api.grpc:proto-google-common-protos:2.67.0", + "com.google.auth:google-auth-library-credentials:1.43.0", + "com.google.auth:google-auth-library-oauth2-http:1.43.0", "com.google.auto.value:auto-value-annotations:1.11.0", "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", "com.google.code.gson:gson:2.13.2", - "com.google.errorprone:error_prone_annotations:2.45.0", + "com.google.errorprone:error_prone_annotations:2.48.0", "com.google.guava:failureaccess:1.0.1", "com.google.guava:guava:33.5.0-android", "com.google.re2j:re2j:1.8", @@ -23,26 +23,26 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.truth:truth:1.4.5", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day - "io.netty:netty-buffer:4.1.130.Final", - "io.netty:netty-codec-http2:4.1.130.Final", - "io.netty:netty-codec-http:4.1.130.Final", - "io.netty:netty-codec-socks:4.1.130.Final", - "io.netty:netty-codec:4.1.130.Final", - "io.netty:netty-common:4.1.130.Final", - "io.netty:netty-handler-proxy:4.1.130.Final", - "io.netty:netty-handler:4.1.130.Final", - "io.netty:netty-resolver:4.1.130.Final", - "io.netty:netty-tcnative-boringssl-static:2.0.74.Final", - "io.netty:netty-tcnative-classes:2.0.74.Final", - "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.130.Final", - "io.netty:netty-transport-native-unix-common:4.1.130.Final", - "io.netty:netty-transport:4.1.130.Final", + "io.netty:netty-buffer:4.1.131.Final", + "io.netty:netty-codec-http2:4.1.131.Final", + "io.netty:netty-codec-http:4.1.131.Final", + "io.netty:netty-codec-socks:4.1.131.Final", + "io.netty:netty-codec:4.1.131.Final", + "io.netty:netty-common:4.1.131.Final", + "io.netty:netty-handler-proxy:4.1.131.Final", + "io.netty:netty-handler:4.1.131.Final", + "io.netty:netty-resolver:4.1.131.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.75.Final", + "io.netty:netty-tcnative-classes:2.0.75.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.131.Final", + "io.netty:netty-transport-native-unix-common:4.1.131.Final", + "io.netty:netty-transport:4.1.131.Final", "io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", "io.perfmark:perfmark-api:0.27.0", "junit:junit:4.13.2", "org.checkerframework:checker-qual:3.49.5", - "org.codehaus.mojo:animal-sniffer-annotations:1.26", + "org.codehaus.mojo:animal-sniffer-annotations:1.27", ] # GRPC_DEPS_END diff --git a/SECURITY.md b/SECURITY.md index fa5b85c0e3a..2cb9f8a1fd9 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -399,7 +399,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver 1.71.x-1.74.x | 4.1.110.Final | 2.0.70.Final 1.75.x-1.76.x | 4.1.124.Final | 2.0.72.Final 1.77.x-1.78.x | 4.1.127.Final | 2.0.74.Final -1.79.x- | 4.1.130.Final | 2.0.74.Final +1.79.x-1.80.x | 4.1.130.Final | 2.0.74.Final +1.81.x- | 4.1.131.Final | 2.0.75.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 9846cf3fd84..04f1a9e7722 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-stub:${grpcVersion}" implementation "io.grpc:grpc-auth:${grpcVersion}" - implementation "com.google.auth:google-auth-library-oauth2-http:1.41.0" + implementation "com.google.auth:google-auth-library-oauth2-http:1.43.0" implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24" runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" } diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle index d2eda15ab3d..2d9a4b4c775 100644 --- a/examples/example-oauth/build.gradle +++ b/examples/example-oauth/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-stub:${grpcVersion}" implementation "io.grpc:grpc-auth:${grpcVersion}" - implementation "com.google.auth:google-auth-library-oauth2-http:1.41.0" + implementation "com.google.auth:google-auth-library-oauth2-http:1.43.0" runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 73c19140478..207c3b24457 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,9 +22,9 @@ androidx-test-core = "androidx.test:core:1.7.0" androidx-test-ext-junit = "androidx.test.ext:junit:1.3.0" androidx-test-rules = "androidx.test:rules:1.7.0" androidx-test-runner = "androidx.test:runner:1.7.0" -animalsniffer = "org.codehaus.mojo:animal-sniffer:1.26" -animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.26" -assertj-core = "org.assertj:assertj-core:3.27.6" +animalsniffer = "org.codehaus.mojo:animal-sniffer:1.27" +animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.27" +assertj-core = "org.assertj:assertj-core:3.27.7" # 1.11.1 started converting jsr305 @Nullable to jspecify # checkForUpdates: auto-value:1.11.0 auto-value = "com.google.auto.value:auto-value:1.11.0" @@ -45,7 +45,7 @@ conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" cronet-api = "org.chromium.net:cronet-api:119.6045.31" # checkForUpdates: cronet-embedded:119.6045.31 cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31" -errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.45.0" +errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.48.0" # 2.32.0+ requires Java 17+ # checkForUpdates: errorprone-core:2.31.+ errorprone-core = "com.google.errorprone:error_prone_core:2.31.0" @@ -53,10 +53,10 @@ errorprone-core = "com.google.errorprone:error_prone_core:2.31.0" # checkForUpdates: errorprone-corejava8:2.10.+ errorprone-corejava8 = "com.google.errorprone:error_prone_core:2.10.0" google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.63.2" -google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.41.0" -google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.41.0" +google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.43.0" +google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.43.0" # Release notes: https://cloud.google.com/logging/docs/release-notes -google-cloud-logging = "com.google.cloud:google-cloud-logging:3.23.9" +google-cloud-logging = "com.google.cloud:google-cloud-logging:3.28.0" gson = "com.google.code.gson:gson:2.13.2" guava = "com.google.guava:guava:33.5.0-android" guava-betaChecker = "com.google.guava:guava-beta-checker:1.0" @@ -72,16 +72,16 @@ javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1" # 12.0.0+ require Java 17+ # checkForUpdates: jetty-client:11.+ jetty-client = "org.eclipse.jetty:jetty-client:11.0.26" -jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.5" +jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.7" # 10.0.25+ uses uses @Deprecated(since=/forRemoval=) from Java 9 # checkForUpdates: jetty-http2-server10:10.0.24 jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.24" -jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.5" +jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.7" # checkForUpdates: jetty-servlet10:10.0.24 jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.24" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" junit = "junit:junit:4.13.2" -lincheck = "org.jetbrains.lincheck:lincheck:3.3.2" +lincheck = "org.jetbrains.lincheck:lincheck:3.4" # Update notes / 2023-07-19 sergiitk: # Couldn't update to 5.4.0, updated to the last in 4.x line. Version 5.x breaks some tests. # Error log: https://github.com/grpc/grpc-java/pull/10359#issuecomment-1632834435 @@ -94,17 +94,17 @@ mockito-android = "org.mockito:mockito-android:4.4.0" mockito-core = "org.mockito:mockito-core:4.4.0" # Need to decide when we require users to absorb the breaking changes in 4.2 # checkForUpdates: netty-codec-http2:4.1.+ -netty-codec-http2 = "io.netty:netty-codec-http2:4.1.130.Final" +netty-codec-http2 = "io.netty:netty-codec-http2:4.1.131.Final" # checkForUpdates: netty-handler-proxy:4.1.+ -netty-handler-proxy = "io.netty:netty-handler-proxy:4.1.130.Final" +netty-handler-proxy = "io.netty:netty-handler-proxy:4.1.131.Final" # Keep the following references of tcnative version in sync whenever it's updated: # SECURITY.md -netty-tcnative = "io.netty:netty-tcnative-boringssl-static:2.0.74.Final" -netty-tcnative-classes = "io.netty:netty-tcnative-classes:2.0.74.Final" +netty-tcnative = "io.netty:netty-tcnative-boringssl-static:2.0.75.Final" +netty-tcnative-classes = "io.netty:netty-tcnative-classes:2.0.75.Final" # checkForUpdates: netty-transport-epoll:4.1.+ -netty-transport-epoll = "io.netty:netty-transport-native-epoll:4.1.130.Final" +netty-transport-epoll = "io.netty:netty-transport-native-epoll:4.1.131.Final" # checkForUpdates: netty-unix-common:4.1.+ -netty-unix-common = "io.netty:netty-transport-native-unix-common:4.1.130.Final" +netty-unix-common = "io.netty:netty-transport-native-unix-common:4.1.131.Final" okhttp = "com.squareup.okhttp:okhttp:2.7.5" # okio 3.5+ uses Kotlin 1.9+ which requires Android Gradle Plugin 9+ # checkForUpdates: okio:3.4.+ @@ -114,11 +114,11 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" } opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" } opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" } -opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.57.0" -opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.57.0-alpha" -opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.52.0-alpha" -opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.57.0" -opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.57.0" +opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.60.1" +opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.60.1-alpha" +opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.54.0-alpha" +opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.60.1" +opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.60.1" perfmark-api = "io.perfmark:perfmark-api:0.27.0" # Not upgrading to 4.x as it is not yet ABI compatible. # https://github.com/protocolbuffers/protobuf/issues/17247 @@ -131,15 +131,15 @@ protobuf-javalite = "com.google.protobuf:protobuf-javalite:3.25.8" # checkForUpdates: protobuf-protoc:3.+ protobuf-protoc = "com.google.protobuf:protoc:3.25.8" re2j = "com.google.re2j:re2j:1.8" -robolectric = "org.robolectric:robolectric:4.16" +robolectric = "org.robolectric:robolectric:4.16.1" s2a-proto = "com.google.s2a.proto.v2:s2a-proto:0.1.3" signature-android = "net.sf.androidscents.signature:android-api-level-21:5.0.1_r2" signature-java = "org.codehaus.mojo.signature:java18:1.0" # 11.0.0+ require Java 17+ # checkForUpdates: tomcat-embed-core:10.+ -tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.50" +tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.52" # checkForUpdates: tomcat-embed-core9:9.+ -tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.113" +tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.115" truth = "com.google.truth:truth:1.4.5" # checkForUpdates: undertow-servlet22:2.2.+ undertow-servlet22 = "io.undertow:undertow-servlet:2.2.38.Final" diff --git a/repositories.bzl b/repositories.bzl index de0729c35ab..51460a4fc01 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -12,9 +12,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # GRPC_DEPS_START IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.android:annotations:4.1.1.4", - "com.google.api.grpc:proto-google-common-protos:2.63.2", + "com.google.api.grpc:proto-google-common-protos:2.67.0", "com.google.auth:google-auth-library-credentials:1.41.0", - "com.google.auth:google-auth-library-oauth2-http:1.41.0", + "com.google.auth:google-auth-library-oauth2-http:1.43.0", "com.google.auto.value:auto-value-annotations:1.11.0", "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", @@ -27,26 +27,26 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.truth:truth:1.4.5", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day - "io.netty:netty-buffer:4.1.130.Final", - "io.netty:netty-codec-http2:4.1.130.Final", - "io.netty:netty-codec-http:4.1.130.Final", - "io.netty:netty-codec-socks:4.1.130.Final", - "io.netty:netty-codec:4.1.130.Final", - "io.netty:netty-common:4.1.130.Final", - "io.netty:netty-handler-proxy:4.1.130.Final", - "io.netty:netty-handler:4.1.130.Final", - "io.netty:netty-resolver:4.1.130.Final", - "io.netty:netty-tcnative-boringssl-static:2.0.74.Final", - "io.netty:netty-tcnative-classes:2.0.74.Final", - "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.130.Final", - "io.netty:netty-transport-native-unix-common:4.1.130.Final", - "io.netty:netty-transport:4.1.130.Final", + "io.netty:netty-buffer:4.1.131.Final", + "io.netty:netty-codec-http2:4.1.131.Final", + "io.netty:netty-codec-http:4.1.131.Final", + "io.netty:netty-codec-socks:4.1.131.Final", + "io.netty:netty-codec:4.1.131.Final", + "io.netty:netty-common:4.1.131.Final", + "io.netty:netty-handler-proxy:4.1.131.Final", + "io.netty:netty-handler:4.1.131.Final", + "io.netty:netty-resolver:4.1.131.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.75.Final", + "io.netty:netty-tcnative-classes:2.0.75.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.131.Final", + "io.netty:netty-transport-native-unix-common:4.1.131.Final", + "io.netty:netty-transport:4.1.131.Final", "io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", "io.perfmark:perfmark-api:0.27.0", "junit:junit:4.13.2", "org.checkerframework:checker-qual:3.49.5", - "org.codehaus.mojo:animal-sniffer-annotations:1.26", + "org.codehaus.mojo:animal-sniffer-annotations:1.27", ] # GRPC_DEPS_END