From 4a8cc562a0621fc8f7fc0e07ebe758f38033c591 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 12 Feb 2025 14:54:46 -0800 Subject: [PATCH] Upgrade netty-tcnative to 2.0.70 --- MODULE.bazel | 5 +++-- SECURITY.md | 3 ++- gradle/libs.versions.toml | 2 +- repositories.bzl | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7131affbdff..9c18d918a2c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -31,8 +31,8 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "io.netty:netty-handler-proxy:4.1.110.Final", "io.netty:netty-handler:4.1.110.Final", "io.netty:netty-resolver:4.1.110.Final", - "io.netty:netty-tcnative-boringssl-static:2.0.65.Final", - "io.netty:netty-tcnative-classes:2.0.65.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.70.Final", + "io.netty:netty-tcnative-classes:2.0.70.Final", "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final", "io.netty:netty-transport-native-unix-common:4.1.110.Final", "io.netty:netty-transport:4.1.110.Final", @@ -48,6 +48,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5") + # CEL Spec may be removed when cncf/xds MODULE is no longer using protobuf 27.x bazel_dep(name = "cel-spec", repo_name = "dev_cel", version = "0.15.0") bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.bcr.1") diff --git a/SECURITY.md b/SECURITY.md index 5c5e3598b29..48d6e0919a1 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -399,7 +399,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver 1.57.x-1.58.x | 4.1.93.Final | 2.0.61.Final 1.59.x | 4.1.97.Final | 2.0.61.Final 1.60.x-1.66.x | 4.1.100.Final | 2.0.61.Final -1.67.x | 4.1.110.Final | 2.0.65.Final +1.67.x-1.70.x | 4.1.110.Final | 2.0.65.Final +1.71.x- | 4.1.110.Final | 2.0.70.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1554d6b2e0..b6b2e5e0e45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ netty = '4.1.110.Final' # Keep the following references of tcnative version in sync whenever it's updated: # SECURITY.md -nettytcnative = '2.0.65.Final' +nettytcnative = '2.0.70.Final' opencensus = "0.31.1" # Not upgrading to 4.x as it is not yet ABI compatible. # https://github.com/protocolbuffers/protobuf/issues/17247 diff --git a/repositories.bzl b/repositories.bzl index b431b283a91..a4f5b0de1c6 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -35,8 +35,8 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "io.netty:netty-handler-proxy:4.1.110.Final", "io.netty:netty-handler:4.1.110.Final", "io.netty:netty-resolver:4.1.110.Final", - "io.netty:netty-tcnative-boringssl-static:2.0.65.Final", - "io.netty:netty-tcnative-classes:2.0.65.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.70.Final", + "io.netty:netty-tcnative-classes:2.0.70.Final", "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final", "io.netty:netty-transport-native-unix-common:4.1.110.Final", "io.netty:netty-transport:4.1.110.Final",