Skip to content

Commit

Permalink
all: Update netty to 4.1.77.Final and netty_tcnative to 2.0.53.Final
Browse files Browse the repository at this point in the history
  • Loading branch information
@temawi
temawi committed Jun 14, 2022
1 parent 428b541 commit ba76107
Show file tree
Hide file tree
Showing 13 changed files with 57 additions and 19 deletions.
5 changes: 3 additions & 2 deletions SECURITY.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ If you are running in a runtime environment that also uses Netty (e.g., Hadoop,
Below are known to work version combinations:

grpc-netty version | netty-handler version | netty-tcnative-boringssl-static version
------------------ | --------------------- | ---------------------------------------
------------------ |-----------------------| ---------------------------------------
1.0.0-1.0.1 | 4.1.3.Final | 1.1.33.Fork19
1.0.2-1.0.3 | 4.1.6.Final | 1.1.33.Fork23
1.1.x-1.3.x | 4.1.8.Final | 1.1.33.Fork26
Expand All @@ -410,7 +410,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
1.32.x-1.34.x | 4.1.51.Final | 2.0.31.Final
1.35.x-1.41.x | 4.1.52.Final | 2.0.34.Final
1.42.x-1.43.x | 4.1.63.Final | 2.0.38.Final
1.44.x | 4.1.72.Final | 2.0.46.Final
1.44.x-1.45.x | 4.1.72.Final | 2.0.46.Final
1.46.x- | 4.1.77.Final | 2.0.52.Final

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

Expand Down
1 change: 1 addition & 0 deletions alts/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies {
exclude group: 'junit', module: 'junit'
}
testRuntimeOnly libraries.netty_tcnative,
libraries.netty_tcnative_classes,
libraries.netty_epoll
signature 'org.codehaus.mojo.signature:java17:1.0@signature'
}
Expand Down
1 change: 1 addition & 0 deletions benchmarks/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies {
project(path: ':grpc-xds', configuration: 'shadow'),
libraries.hdrhistogram,
libraries.netty_tcnative,
libraries.netty_tcnative_classes,
libraries.netty_epoll,
libraries.math
compileOnly libraries.javax_annotation
Expand Down
11 changes: 9 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ subprojects {
protocPluginBaseName = 'protoc-gen-grpc-java'
javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix"

nettyVersion = '4.1.72.Final'
nettyVersion = '4.1.77.Final'
nettyTcnativeVersion = '2.0.53.Final'
guavaVersion = '31.1-android'
googleauthVersion = '1.4.0'
protobufVersion = '3.19.2'
Expand Down Expand Up @@ -185,7 +186,13 @@ 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.46.Final',
netty_tcnative: "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}",
netty_tcnative_classes: "io.netty:netty-tcnative-classes:${nettyTcnativeVersion}",
netty_tcnative_linux_x86_64: "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}:linux-x86_64",
netty_tcnative_linux_aarch_64: "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}:linux-aarch_64",
netty_tcnative_osx_x86_64: "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}:osx-x86_64",
netty_tcnative_osx_aarch_64: "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}:osx-aarch_64",
netty_tcnative_windows_x86_64: "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}:windows-x86_64",

conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.1',
re2j: 'com.google.re2j:re2j:1.5',
Expand Down
1 change: 1 addition & 0 deletions examples/example-tls/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ java_library(
),
runtime_deps = [
"@maven//:io_netty_netty_tcnative_boringssl_static",
"@maven//:io_netty_netty_tcnative_classes",
],
deps = [
":helloworld_java_grpc",
Expand Down
8 changes: 7 additions & 1 deletion examples/example-tls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.48.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.19.2</protoc.version>
<netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
<netty.tcnative.version>2.0.53.Final</netty.tcnative.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
Expand Down Expand Up @@ -57,6 +57,12 @@
<version>${netty.tcnative.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-classes</artifactId>
<version>${netty.tcnative.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion gae-interop-testing/gae-jdk8/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
}
implementation libraries.junit
implementation libraries.protobuf
runtimeOnly libraries.netty_tcnative
runtimeOnly libraries.netty_tcnative, libraries.netty_tcnative_classes
}

compileJava {
Expand Down
1 change: 1 addition & 0 deletions interop-testing/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ dependencies {
runtimeOnly group: 'io.github.devatherock', name: 'jul-jsonformatter', version: '1.1.0'
runtimeOnly libraries.opencensus_impl,
libraries.netty_tcnative,
libraries.netty_tcnative_classes,
project(':grpc-grpclb'),
project(':grpc-rls')
testImplementation project(':grpc-context').sourceSets.test.output,
Expand Down
6 changes: 6 additions & 0 deletions netty/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ dependencies {
project(':grpc-testing-proto'),
libraries.netty_epoll_common
testRuntimeOnly libraries.netty_tcnative,
libraries.netty_tcnative_classes,
libraries.netty_tcnative_linux_x86_64,
libraries.netty_tcnative_linux_aarch_64,
libraries.netty_tcnative_osx_x86_64,
libraries.netty_tcnative_osx_aarch_64,
libraries.netty_tcnative_windows_x86_64,
libraries.conscrypt,
libraries.netty_epoll
signature "org.codehaus.mojo.signature:java17:1.0@signature"
Expand Down
1 change: 1 addition & 0 deletions netty/shaded/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ java_library(
runtime_deps = [
"//netty",
"@io_netty_netty_tcnative_boringssl_static//jar",
"@io_netty_netty_tcnative_classes//jar",
"@io_netty_netty_transport_native_epoll_linux_x86_64//jar",
],
)
6 changes: 6 additions & 0 deletions netty/shaded/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ sourceSets { testShadow {} }
dependencies {
implementation project(':grpc-netty')
runtimeOnly libraries.netty_tcnative,
libraries.netty_tcnative_classes,
libraries.netty_tcnative_linux_x86_64,
libraries.netty_tcnative_linux_aarch_64,
libraries.netty_tcnative_osx_x86_64,
libraries.netty_tcnative_osx_aarch_64,
libraries.netty_tcnative_windows_x86_64,
libraries.netty_epoll,
libraries.netty_epoll_arm64
testShadowImplementation files(shadowJar),
Expand Down
25 changes: 13 additions & 12 deletions repositories.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,19 @@ 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.72.Final",
"io.netty:netty-codec-http2:4.1.72.Final",
"io.netty:netty-codec-http:4.1.72.Final",
"io.netty:netty-codec-socks:4.1.72.Final",
"io.netty:netty-codec:4.1.72.Final",
"io.netty:netty-common:4.1.72.Final",
"io.netty:netty-handler-proxy:4.1.72.Final",
"io.netty:netty-handler:4.1.72.Final",
"io.netty:netty-resolver:4.1.72.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.46.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.72.Final",
"io.netty:netty-transport:4.1.72.Final",
"io.netty:netty-buffer:4.1.77.Final",
"io.netty:netty-codec-http2:4.1.77.Final",
"io.netty:netty-codec-http:4.1.77.Final",
"io.netty:netty-codec-socks:4.1.77.Final",
"io.netty:netty-codec:4.1.77.Final",
"io.netty:netty-common:4.1.77.Final",
"io.netty:netty-handler-proxy:4.1.77.Final",
"io.netty:netty-handler:4.1.77.Final",
"io.netty:netty-resolver:4.1.77.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.53.Final",
"io.netty:netty-tcnative-classes:2.0.53.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.77.Final",
"io.netty:netty-transport:4.1.77.Final",
"io.opencensus:opencensus-api:0.24.0",
"io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
"io.perfmark:perfmark-api:0.25.0",
Expand Down
8 changes: 7 additions & 1 deletion xds/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ dependencies {
shadow project(path: ':grpc-netty-shaded', configuration: 'shadow')

signature "org.codehaus.mojo.signature:java17:1.0@signature"
testRuntimeOnly libraries.netty_tcnative
testRuntimeOnly libraries.netty_tcnative,
libraries.netty_tcnative_classes,
libraries.netty_tcnative_linux_x86_64,
libraries.netty_tcnative_linux_aarch_64,
libraries.netty_tcnative_osx_x86_64,
libraries.netty_tcnative_osx_aarch_64,
libraries.netty_tcnative_windows_x86_64
}

sourceSets {
Expand Down

0 comments on commit ba76107

Please sign in to comment.