Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Netty upgrade to 4.1.110 in grpc-java #11273

Merged
merged 12 commits into from
Aug 2, 2024
Merged

Netty upgrade to 4.1.110 in grpc-java #11273

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
693ec65
Bump Netty to 4.1.110.Final
kannanjgithub Jun 3, 2024
32a05d2
Bump Netty to 4.1.110.Final
kannanjgithub Jun 3, 2024
714f88d
Change resource file name used in Netty unit test.
kannanjgithub Jun 7, 2024
4681f83
Fix versions in MODULE.bazel. Fix versions mapping in SECURITY.md.
kannanjgithub Jun 12, 2024
bc88000
Merge branch 'master' into netty-upgrade
kannanjgithub Aug 2, 2024
d42bd49
Revert "Start 1.67.0 development cycle (#11416)"
kannanjgithub Aug 2, 2024
1d5f27b
Update README etc to reference 1.66.0
kannanjgithub Aug 2, 2024
4746ec3
Bump version to 1.66.0
kannanjgithub Aug 2, 2024
585ee13
Bump version to 1.66.1-SNAPSHOT
kannanjgithub Aug 2, 2024
cc3d7af
Empty-Commit to retrigger tests
kannanjgithub Aug 2, 2024
0863cd7
Revert "Bump version to 1.66.1-SNAPSHOT"
kannanjgithub Aug 2, 2024
4c0d369
Revert "Bump version to 1.66.0"
kannanjgithub Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions SECURITY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
1.57.x-1.58.x | 4.1.93.Final | 2.0.61.Final
1.59.x | 4.1.97.Final | 2.0.61.Final
1.60.x- | 4.1.100.Final | 2.0.61.Final
1.61.x- | 4.1.110.Final | 2.0.65.Final
ejona86 marked this conversation as resolved.
Show resolved Hide resolved

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

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
googleauth = "1.22.0"
netty = '4.1.100.Final'
netty = '4.1.110.Final'
# Keep the following references of tcnative version in sync whenever it's updated:
# SECURITY.md
nettytcnative = '2.0.61.Final'
nettytcnative = '2.0.65.Final'
opencensus = "0.31.1"
protobuf = "3.25.1"

Expand Down
2 changes: 1 addition & 1 deletion netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void nettyResourcesUpdated() throws IOException {
InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
.getResourceAsStream(
"META-INF/native-image/io.grpc.netty.shaded.io.netty/netty-transport/"
+ "reflection-config.json");
+ "reflect-config.json");
assertThat(inputStream).isNotNull();

Scanner s = new Scanner(inputStream, StandardCharsets.UTF_8.name()).useDelimiter("\\A");
Expand Down
28 changes: 14 additions & 14 deletions repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.truth:truth:1.1.5",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
"io.netty:netty-buffer:4.1.100.Final",
"io.netty:netty-codec-http2:4.1.100.Final",
"io.netty:netty-codec-http:4.1.100.Final",
"io.netty:netty-codec-socks:4.1.100.Final",
"io.netty:netty-codec:4.1.100.Final",
"io.netty:netty-common:4.1.100.Final",
"io.netty:netty-handler-proxy:4.1.100.Final",
"io.netty:netty-handler:4.1.100.Final",
"io.netty:netty-resolver:4.1.100.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
"io.netty:netty-tcnative-classes:2.0.61.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
"io.netty:netty-transport-native-unix-common:4.1.100.Final",
"io.netty:netty-transport:4.1.100.Final",
"io.netty:netty-buffer:4.1.110.Final",
"io.netty:netty-codec-http2:4.1.110.Final",
"io.netty:netty-codec-http:4.1.110.Final",
"io.netty:netty-codec-socks:4.1.110.Final",
"io.netty:netty-codec:4.1.110.Final",
"io.netty:netty-common:4.1.110.Final",
"io.netty:netty-handler-proxy:4.1.110.Final",
"io.netty:netty-handler:4.1.110.Final",
"io.netty:netty-resolver:4.1.110.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final",
"io.netty:netty-tcnative-classes:2.0.65.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
"io.netty:netty-transport:4.1.110.Final",
"io.opencensus:opencensus-api:0.31.0",
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
"io.perfmark:perfmark-api:0.26.0",
Expand Down