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

netty:Upgrade Netty from 4.1.79 to 4.1.87, tcnative from 2.0.54 to 2.0.56 #9784

Merged
merged 7 commits into from
Feb 7, 2023
Merged

netty:Upgrade Netty from 4.1.79 to 4.1.87, tcnative from 2.0.54 to 2.0.56 #9784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33c59a9
Upgrade Netty from 4.1.79 to 4.1.86.
larry-safran Jan 3, 2023
4704cad
Split long line.
larry-safran Jan 4, 2023
471a567
Update netty version number in files that were missed.
larry-safran Jan 5, 2023
ef88300
Upgrade Netty from 4.1.86 to 4.1.87 and tcnative from 2.0.54 to 2.0.56
larry-safran Feb 1, 2023
78c8573
fix previous tcnative version
larry-safran Feb 1, 2023
80109ad
Merge branch 'master' into netty_upgrade
larry-safran Feb 6, 2023
eae516b
Update SECURITY.md
larry-safran Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions SECURITY.md
View file
Open in desktop
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 @@ -412,7 +412,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
1.42.x-1.43.x | 4.1.63.Final | 2.0.38.Final
1.44.x-1.47.x | 4.1.72.Final | 2.0.46.Final
1.48.x-1.49.x | 4.1.77.Final | 2.0.53.Final
1.50.x- | 4.1.79.Final | 2.0.54.Final
1.50.x-1.53.x | 4.1.79.Final | 2.0.54.Final
1.54.x- | 4.1.87.Final | 2.0.56.Final

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

Expand Down
2 changes: 1 addition & 1 deletion examples/example-tls/pom.xml
View file
Open in desktop
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.54.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.21.7</protoc.version>
<netty.tcnative.version>2.0.54.Final</netty.tcnative.version>
<netty.tcnative.version>2.0.56.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
2 changes: 1 addition & 1 deletion examples/example-xds/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process.
def grpcVersion = '1.54.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def nettyTcNativeVersion = '2.0.31.Final'
def nettyTcNativeVersion = '2.0.56.Final'
def protocVersion = '3.21.7'

dependencies {
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
Expand Up @@ -5,8 +5,8 @@ autovalue = "1.9"
checkstyle = "8.28"
googleauth = "1.4.0"
guava = "31.1-android"
netty = '4.1.79.Final'
nettytcnative = '2.0.54.Final'
netty = '4.1.87.Final'
nettytcnative = '2.0.56.Final'
opencensus = "0.31.0"
protobuf = "3.21.7"

Expand Down
3 changes: 2 additions & 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 @@ -78,7 +78,8 @@ public void noNormalNetty() throws Exception {
public void nettyResourcesUpdated() throws IOException {
InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
.getResourceAsStream(
"META-INF/native-image/io.grpc.netty.shaded.io.netty/transport/reflection-config.json");
"META-INF/native-image/io.grpc.netty.shaded.io.netty/netty-transport/"
+ "reflection-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.0.1",
"com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:1.17.5",
"io.netty:netty-buffer:4.1.79.Final",
"io.netty:netty-codec-http2:4.1.79.Final",
"io.netty:netty-codec-http:4.1.79.Final",
"io.netty:netty-codec-socks:4.1.79.Final",
"io.netty:netty-codec:4.1.79.Final",
"io.netty:netty-common:4.1.79.Final",
"io.netty:netty-handler-proxy:4.1.79.Final",
"io.netty:netty-handler:4.1.79.Final",
"io.netty:netty-resolver:4.1.79.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.54.Final",
"io.netty:netty-tcnative-classes:2.0.54.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.79.Final",
"io.netty:netty-transport-native-unix-common:4.1.79.Final",
"io.netty:netty-transport:4.1.79.Final",
"io.netty:netty-buffer:4.1.87.Final",
"io.netty:netty-codec-http2:4.1.87.Final",
"io.netty:netty-codec-http:4.1.87.Final",
"io.netty:netty-codec-socks:4.1.87.Final",
"io.netty:netty-codec:4.1.87.Final",
"io.netty:netty-common:4.1.87.Final",
"io.netty:netty-handler-proxy:4.1.87.Final",
"io.netty:netty-handler:4.1.87.Final",
"io.netty:netty-resolver:4.1.87.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.56.Final",
"io.netty:netty-tcnative-classes:2.0.56.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.87.Final",
"io.netty:netty-transport-native-unix-common:4.1.87.Final",
"io.netty:netty-transport:4.1.87.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