FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Upgrade Netty to 4.1.132 and netty-tcnative to 2.0.75 by ejona86 · Pull Request #12738 · grpc/grpc-java · GitHub

/ grpc-java Public

Upgrade Netty to 4.1.132 and netty-tcnative to 2.0.75 #12738

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

Merged
ejona86 merged 1 commit into from
Apr 2, 2026
Conversation 3 Commits 1 Checks 10 Files changed
Merged

Upgrade Netty to 4.1.132 and netty-tcnative to 2.0.75 #12738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .bazel  (1) .bzl  (1) .java  (1) .md  (1) .toml  (1) All 5 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
28 changes: 14 additions & 14 deletions MODULE.bazel
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.truth:truth:1.4.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.130.Final",
"io.netty:netty-codec-http2:4.1.130.Final",
"io.netty:netty-codec-http:4.1.130.Final",
"io.netty:netty-codec-socks:4.1.130.Final",
"io.netty:netty-codec:4.1.130.Final",
"io.netty:netty-common:4.1.130.Final",
"io.netty:netty-handler-proxy:4.1.130.Final",
"io.netty:netty-handler:4.1.130.Final",
"io.netty:netty-resolver:4.1.130.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.74.Final",
"io.netty:netty-tcnative-classes:2.0.74.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.130.Final",
"io.netty:netty-transport-native-unix-common:4.1.130.Final",
"io.netty:netty-transport:4.1.130.Final",
"io.netty:netty-buffer:4.1.132.Final",
"io.netty:netty-codec-http2:4.1.132.Final",
"io.netty:netty-codec-http:4.1.132.Final",
"io.netty:netty-codec-socks:4.1.132.Final",
"io.netty:netty-codec:4.1.132.Final",
"io.netty:netty-common:4.1.132.Final",
"io.netty:netty-handler-proxy:4.1.132.Final",
"io.netty:netty-handler:4.1.132.Final",
"io.netty:netty-resolver:4.1.132.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.75.Final",
"io.netty:netty-tcnative-classes:2.0.75.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.132.Final",
"io.netty:netty-transport-native-unix-common:4.1.132.Final",
"io.netty:netty-transport:4.1.132.Final",
"io.opencensus:opencensus-api:0.31.0",
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
"io.perfmark:perfmark-api:0.27.0",
Expand Down
3 changes: 2 additions & 1 deletion SECURITY.md
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
1.71.x-1.74.x | 4.1.110.Final | 2.0.70.Final
1.75.x-1.76.x | 4.1.124.Final | 2.0.72.Final
1.77.x-1.78.x | 4.1.127.Final | 2.0.74.Final
1.79.x- | 4.1.130.Final | 2.0.74.Final
1.79.x-1.80.x | 4.1.130.Final | 2.0.74.Final
1.81.x- | 4.1.132.Final | 2.0.75.Final

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

Expand Down
15 changes: 10 additions & 5 deletions alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,11 @@ public void operationComplete(ChannelFuture future) throws Exception {
channel.flush();

// Capture the protected data written to the wire.
assertEquals(1, channel.outboundMessages().size());
ByteBuf protectedData = channel.readOutbound();
assertThat(channel.outboundMessages()).isNotEmpty();
ByteBuf protectedData = channel.alloc().buffer();
while (!channel.outboundMessages().isEmpty()) {
protectedData.writeBytes((ByteBuf) channel.readOutbound());
}
assertEquals(message.length(), writeCount.get());

// Read the protected message at the server and verify it matches the original message.
Expand Down Expand Up @@ -327,16 +330,18 @@ public void doNotFlushEmptyBuffer() throws Exception {
String message = "hello";
ByteBuf in = Unpooled.copiedBuffer(message, UTF_8);

assertEquals(0, protector.flushes.get());
int flushes = protector.flushes.get();
Future<?> done = channel.write(in);
channel.flush();
flushes++;
done.get(5, TimeUnit.SECONDS);
assertEquals(1, protector.flushes.get());
assertEquals(flushes, protector.flushes.get());

// Flush does not propagate
done = channel.write(Unpooled.EMPTY_BUFFER);
channel.flush();
done.get(5, TimeUnit.SECONDS);
assertEquals(1, protector.flushes.get());
assertEquals(flushes, protector.flushes.get());
}

@Test
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,17 @@ mockito-android = "org.mockito:mockito-android:4.4.0"
mockito-core = "org.mockito:mockito-core:4.4.0"
# Need to decide when we require users to absorb the breaking changes in 4.2
# checkForUpdates: netty-codec-http2:4.1.+
netty-codec-http2 = "io.netty:netty-codec-http2:4.1.130.Final"
netty-codec-http2 = "io.netty:netty-codec-http2:4.1.132.Final"
# checkForUpdates: netty-handler-proxy:4.1.+
netty-handler-proxy = "io.netty:netty-handler-proxy:4.1.130.Final"
netty-handler-proxy = "io.netty:netty-handler-proxy:4.1.132.Final"
# Keep the following references of tcnative version in sync whenever it's updated:
# SECURITY.md
netty-tcnative = "io.netty:netty-tcnative-boringssl-static:2.0.74.Final"
netty-tcnative-classes = "io.netty:netty-tcnative-classes:2.0.74.Final"
netty-tcnative = "io.netty:netty-tcnative-boringssl-static:2.0.75.Final"
netty-tcnative-classes = "io.netty:netty-tcnative-classes:2.0.75.Final"
# checkForUpdates: netty-transport-epoll:4.1.+
netty-transport-epoll = "io.netty:netty-transport-native-epoll:4.1.130.Final"
netty-transport-epoll = "io.netty:netty-transport-native-epoll:4.1.132.Final"
# checkForUpdates: netty-unix-common:4.1.+
netty-unix-common = "io.netty:netty-transport-native-unix-common:4.1.130.Final"
netty-unix-common = "io.netty:netty-transport-native-unix-common:4.1.132.Final"
okhttp = "com.squareup.okhttp:okhttp:2.7.5"
# okio 3.5+ uses Kotlin 1.9+ which requires Android Gradle Plugin 9+
# checkForUpdates: okio:3.4.+
Expand Down
28 changes: 14 additions & 14 deletions repositories.bzl
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.truth:truth:1.4.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.130.Final",
"io.netty:netty-codec-http2:4.1.130.Final",
"io.netty:netty-codec-http:4.1.130.Final",
"io.netty:netty-codec-socks:4.1.130.Final",
"io.netty:netty-codec:4.1.130.Final",
"io.netty:netty-common:4.1.130.Final",
"io.netty:netty-handler-proxy:4.1.130.Final",
"io.netty:netty-handler:4.1.130.Final",
"io.netty:netty-resolver:4.1.130.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.74.Final",
"io.netty:netty-tcnative-classes:2.0.74.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.130.Final",
"io.netty:netty-transport-native-unix-common:4.1.130.Final",
"io.netty:netty-transport:4.1.130.Final",
"io.netty:netty-buffer:4.1.132.Final",
"io.netty:netty-codec-http2:4.1.132.Final",
"io.netty:netty-codec-http:4.1.132.Final",
"io.netty:netty-codec-socks:4.1.132.Final",
"io.netty:netty-codec:4.1.132.Final",
"io.netty:netty-common:4.1.132.Final",
"io.netty:netty-handler-proxy:4.1.132.Final",
"io.netty:netty-handler:4.1.132.Final",
"io.netty:netty-resolver:4.1.132.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.75.Final",
"io.netty:netty-tcnative-classes:2.0.75.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.132.Final",
"io.netty:netty-transport-native-unix-common:4.1.132.Final",
"io.netty:netty-transport:4.1.132.Final",
"io.opencensus:opencensus-api:0.31.0",
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
"io.perfmark:perfmark-api:0.27.0",
Expand Down
Loading
Back | FazBrowse Home | New Git URL