From cd3a0afa7556cafa19aae3d9f162124cf6c159f5 Mon Sep 17 00:00:00 2001 From: Ran Su Date: Thu, 9 Sep 2021 14:05:16 -0700 Subject: [PATCH] netty: Upgrade to Netty 4.1.68 and tcnative 2.0.42 --- SECURITY.md | 3 ++- build.gradle | 4 ++-- examples/example-tls/pom.xml | 2 +- repositories.bzl | 24 ++++++++++++------------ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index d2482e18cbd..8deb31b8bae 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -408,7 +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- | 4.1.52.Final | 2.0.34.Final +1.35.x-1.41.x | 4.1.52.Final | 2.0.34.Final +1.42.x- | 4.1.68.Final | 2.0.42.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/build.gradle b/build.gradle index fbd55703aea..2d0b6cab52c 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.68.Final' guavaVersion = '30.1-android' googleauthVersion = '0.22.2' protobufVersion = '3.17.2' @@ -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.42.Final', conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.1', re2j: 'com.google.re2j:re2j:1.5', diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 4a1dfe1be15..fd915d9ce2f 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -14,7 +14,7 @@ UTF-8 1.42.0-SNAPSHOT 3.17.2 - 2.0.34.Final + 2.0.42.Final 1.7 1.7 diff --git a/repositories.bzl b/repositories.bzl index 0d6e9ab2f74..1ec7b892cff 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -25,18 +25,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.68.Final", + "io.netty:netty-codec-http2:4.1.68.Final", + "io.netty:netty-codec-http:4.1.68.Final", + "io.netty:netty-codec-socks:4.1.68.Final", + "io.netty:netty-codec:4.1.68.Final", + "io.netty:netty-common:4.1.68.Final", + "io.netty:netty-handler-proxy:4.1.68.Final", + "io.netty:netty-handler:4.1.68.Final", + "io.netty:netty-resolver:4.1.68.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.42.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.68.Final", + "io.netty:netty-transport:4.1.68.Final", "io.opencensus:opencensus-api:0.24.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0", "io.perfmark:perfmark-api:0.23.0",