Skip to content

Commit 70ae832

Browse files
kannanjgithubkannanjgithub
authored
Upgrade Netty to 4.1.110 and tcnative to 2.0.65 (#11444)
Upgrade Netty to 4.1.110 and tcnative to 2.0.65.
1 parent 06135a0 commit 70ae832

File tree

5 files changed

+33
-32
lines changed

5 files changed

+33
-32
lines changed

‎MODULE.bazel‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2222
"com.google.truth:truth:1.4.2",
2323
"com.squareup.okhttp:okhttp:2.7.5",
2424
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
25-
"io.netty:netty-buffer:4.1.100.Final",
26-
"io.netty:netty-codec-http2:4.1.100.Final",
27-
"io.netty:netty-codec-http:4.1.100.Final",
28-
"io.netty:netty-codec-socks:4.1.100.Final",
29-
"io.netty:netty-codec:4.1.100.Final",
30-
"io.netty:netty-common:4.1.100.Final",
31-
"io.netty:netty-handler-proxy:4.1.100.Final",
32-
"io.netty:netty-handler:4.1.100.Final",
33-
"io.netty:netty-resolver:4.1.100.Final",
34-
"io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
35-
"io.netty:netty-tcnative-classes:2.0.61.Final",
36-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
37-
"io.netty:netty-transport-native-unix-common:4.1.100.Final",
38-
"io.netty:netty-transport:4.1.100.Final",
25+
"io.netty:netty-buffer:4.1.110.Final",
26+
"io.netty:netty-codec-http2:4.1.110.Final",
27+
"io.netty:netty-codec-http:4.1.110.Final",
28+
"io.netty:netty-codec-socks:4.1.110.Final",
29+
"io.netty:netty-codec:4.1.110.Final",
30+
"io.netty:netty-common:4.1.110.Final",
31+
"io.netty:netty-handler-proxy:4.1.110.Final",
32+
"io.netty:netty-handler:4.1.110.Final",
33+
"io.netty:netty-resolver:4.1.110.Final",
34+
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final",
35+
"io.netty:netty-tcnative-classes:2.0.65.Final",
36+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
37+
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
38+
"io.netty:netty-transport:4.1.110.Final",
3939
"io.opencensus:opencensus-api:0.31.0",
4040
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
4141
"io.perfmark:perfmark-api:0.27.0",

‎SECURITY.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
398398
1.56.x | 4.1.87.Final | 2.0.61.Final
399399
1.57.x-1.58.x | 4.1.93.Final | 2.0.61.Final
400400
1.59.x | 4.1.97.Final | 2.0.61.Final
401-
1.60.x- | 4.1.100.Final | 2.0.61.Final
401+
1.60.x-1.66.x | 4.1.100.Final | 2.0.61.Final
402+
1.67.x | 4.1.110.Final | 2.0.65.Final
402403

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

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
netty = '4.1.100.Final'
2+
netty = '4.1.110.Final'
33
# Keep the following references of tcnative version in sync whenever it's updated:
44
# SECURITY.md
5-
nettytcnative = '2.0.61.Final'
5+
nettytcnative = '2.0.65.Final'
66
opencensus = "0.31.1"
77
# Not upgrading to 4.x as it is not yet ABI compatible.
88
# https://github.com/protocolbuffers/protobuf/issues/17247

‎netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void nettyResourcesUpdated() throws IOException {
7979
InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
8080
.getResourceAsStream(
8181
"META-INF/native-image/io.grpc.netty.shaded.io.netty/netty-transport/"
82-
+ "reflection-config.json");
82+
+ "reflect-config.json");
8383
assertThat(inputStream).isNotNull();
8484

8585
Scanner s = new Scanner(inputStream, StandardCharsets.UTF_8.name()).useDelimiter("\\A");

‎repositories.bzl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2626
"com.google.truth:truth:1.4.2",
2727
"com.squareup.okhttp:okhttp:2.7.5",
2828
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
29-
"io.netty:netty-buffer:4.1.100.Final",
30-
"io.netty:netty-codec-http2:4.1.100.Final",
31-
"io.netty:netty-codec-http:4.1.100.Final",
32-
"io.netty:netty-codec-socks:4.1.100.Final",
33-
"io.netty:netty-codec:4.1.100.Final",
34-
"io.netty:netty-common:4.1.100.Final",
35-
"io.netty:netty-handler-proxy:4.1.100.Final",
36-
"io.netty:netty-handler:4.1.100.Final",
37-
"io.netty:netty-resolver:4.1.100.Final",
38-
"io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
39-
"io.netty:netty-tcnative-classes:2.0.61.Final",
40-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
41-
"io.netty:netty-transport-native-unix-common:4.1.100.Final",
42-
"io.netty:netty-transport:4.1.100.Final",
29+
"io.netty:netty-buffer:4.1.110.Final",
30+
"io.netty:netty-codec-http2:4.1.110.Final",
31+
"io.netty:netty-codec-http:4.1.110.Final",
32+
"io.netty:netty-codec-socks:4.1.110.Final",
33+
"io.netty:netty-codec:4.1.110.Final",
34+
"io.netty:netty-common:4.1.110.Final",
35+
"io.netty:netty-handler-proxy:4.1.110.Final",
36+
"io.netty:netty-handler:4.1.110.Final",
37+
"io.netty:netty-resolver:4.1.110.Final",
38+
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final",
39+
"io.netty:netty-tcnative-classes:2.0.65.Final",
40+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
41+
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
42+
"io.netty:netty-transport:4.1.110.Final",
4343
"io.opencensus:opencensus-api:0.31.0",
4444
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
4545
"io.perfmark:perfmark-api:0.27.0",

0 commit comments

Comments
 (0)