Skip to content

Commit

Permalink
dep: bump netty to 4.1.63.Final and tcnative to 2.0.38.Final (#8167)
Browse files Browse the repository at this point in the history
Upgrade Netty. This should also resolve #7830.
  • Loading branch information
dapengzhang0 committed Sep 21, 2021
1 parent e4a1377 commit 25022f6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion SECURITY.md
Expand Up @@ -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.63.Final | 2.0.38.Final

_(grpc-netty-shaded avoids issues with keeping these versions in sync.)_

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -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.17.2'
Expand Down Expand Up @@ -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',
Expand Down
24 changes: 12 additions & 12 deletions repositories.bzl
Expand Up @@ -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.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",
Expand Down

0 comments on commit 25022f6

Please sign in to comment.