From 8cfd2fb88683da32e0eb61ed9a593684d251265d Mon Sep 17 00:00:00 2001 From: "Penn (Dapeng) Zhang" Date: Tue, 11 May 2021 15:10:08 -0700 Subject: [PATCH 1/2] dep: bump netty to 4.1.63.Final and tcnative to 2.0.38.Final --- SECURITY.md | 3 ++- build.gradle | 4 ++-- repositories.bzl | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 9bebf5b709d..9afd6f44dd7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -404,7 +404,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver 1.28.x | 4.1.45.Final | 2.0.28.Final 1.29.x-1.31.x | 4.1.48.Final | 2.0.30.Final 1.32.x-1.34.x | 4.1.51.Final | 2.0.31.Final -1.35.x- | 4.1.52.Final | 2.0.34.Final +1.35.x-1.38.x | 4.1.52.Final | 2.0.34.Final +1.39.x- | 4.1.63.Final | 2.0.38.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/build.gradle b/build.gradle index 88cd90b1397..aa21f3af940 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ subprojects { protocPluginBaseName = 'protoc-gen-grpc-java' javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" - nettyVersion = '4.1.52.Final' + nettyVersion = '4.1.63.Final' guavaVersion = '30.1-android' googleauthVersion = '0.22.2' protobufVersion = '3.12.0' @@ -176,7 +176,7 @@ subprojects { // SECURITY.md (multiple occurrences) // examples/example-tls/build.gradle // examples/example-tls/pom.xml - netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.34.Final', + netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.38.Final', conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.1', re2j: 'com.google.re2j:re2j:1.5', diff --git a/repositories.bzl b/repositories.bzl index 2fd188765a5..d3b6ffe4d43 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -23,18 +23,18 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.truth:truth:1.0.1", "com.squareup.okhttp:okhttp:2.7.4", "com.squareup.okio:okio:1.17.5", - "io.netty:netty-buffer:4.1.52.Final", - "io.netty:netty-codec-http2:4.1.52.Final", - "io.netty:netty-codec-http:4.1.52.Final", - "io.netty:netty-codec-socks:4.1.52.Final", - "io.netty:netty-codec:4.1.52.Final", - "io.netty:netty-common:4.1.52.Final", - "io.netty:netty-handler-proxy:4.1.52.Final", - "io.netty:netty-handler:4.1.52.Final", - "io.netty:netty-resolver:4.1.52.Final", - "io.netty:netty-tcnative-boringssl-static:2.0.34.Final", - "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.52.Final", - "io.netty:netty-transport:4.1.52.Final", + "io.netty:netty-buffer:4.1.63.Final", + "io.netty:netty-codec-http2:4.1.63.Final", + "io.netty:netty-codec-http:4.1.63.Final", + "io.netty:netty-codec-socks:4.1.63.Final", + "io.netty:netty-codec:4.1.63.Final", + "io.netty:netty-common:4.1.63.Final", + "io.netty:netty-handler-proxy:4.1.63.Final", + "io.netty:netty-handler:4.1.63.Final", + "io.netty:netty-resolver:4.1.63.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.38.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.63.Final", + "io.netty:netty-transport:4.1.63.Final", "io.opencensus:opencensus-api:0.24.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0", "io.perfmark:perfmark-api:0.23.0", From 78e12406f7d20a2b18237b51e5ce9bb045248711 Mon Sep 17 00:00:00 2001 From: "Penn (Dapeng) Zhang" Date: Wed, 15 Sep 2021 16:47:09 -0700 Subject: [PATCH 2/2] adjust SECURITY.md versions table --- SECURITY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 9ac9ddc3199..df9061eab8f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -408,8 +408,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver 1.28.x | 4.1.45.Final | 2.0.28.Final 1.29.x-1.31.x | 4.1.48.Final | 2.0.30.Final 1.32.x-1.34.x | 4.1.51.Final | 2.0.31.Final -1.35.x-1.38.x | 4.1.52.Final | 2.0.34.Final -1.39.x- | 4.1.63.Final | 2.0.38.Final +1.35.x-1.41.x | 4.1.52.Final | 2.0.34.Final +1.42.x- | 4.1.63.Final | 2.0.38.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_