From 33c59a90b13fd16dee1c76654e19de5ecc8efbf8 Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 3 Jan 2023 15:57:16 -0800 Subject: [PATCH 1/6] Upgrade Netty from 4.1.79 to 4.1.86. --- gradle/libs.versions.toml | 2 +- .../src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 37d443cd479..b7da120fc49 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ autovalue = "1.9" checkstyle = "6.17" googleauth = "1.4.0" guava = "31.1-android" -netty = '4.1.79.Final' +netty = '4.1.86.Final' nettytcnative = '2.0.54.Final' opencensus = "0.31.0" protobuf = "3.21.7" diff --git a/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java b/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java index 5c2ff317ccd..627e1cf6ce7 100644 --- a/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java +++ b/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java @@ -79,7 +79,7 @@ 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"); From 4704cad9e29de3cdec0192299f77d53a4741ee5c Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 3 Jan 2023 17:31:51 -0800 Subject: [PATCH 2/6] Split long line. --- .../src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java b/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java index 627e1cf6ce7..14b1d17f54d 100644 --- a/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java +++ b/netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java @@ -79,7 +79,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/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"); From 471a56727c767fd0f38f8bafa3ebc1bdfbed1fed Mon Sep 17 00:00:00 2001 From: larry-safran Date: Wed, 4 Jan 2023 16:10:29 -0800 Subject: [PATCH 3/6] Update netty version number in files that were missed. --- SECURITY.md | 3 ++- repositories.bzl | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 1d36eb90103..3aab8007c54 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -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.52.x | 4.1.79.Final | 2.0.54.Final +1.53.x- | 4.1.86.Final | 2.0.54.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/repositories.bzl b/repositories.bzl index cced1d29bee..0d8ea192891 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -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-buffer:4.1.86.Final", + "io.netty:netty-codec-http2:4.1.86.Final", + "io.netty:netty-codec-http:4.1.86.Final", + "io.netty:netty-codec-socks:4.1.86.Final", + "io.netty:netty-codec:4.1.86.Final", + "io.netty:netty-common:4.1.86.Final", + "io.netty:netty-handler-proxy:4.1.86.Final", + "io.netty:netty-handler:4.1.86.Final", + "io.netty:netty-resolver:4.1.86.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-transport-native-epoll:jar:linux-x86_64:4.1.86.Final", + "io.netty:netty-transport-native-unix-common:4.1.86.Final", + "io.netty:netty-transport:4.1.86.Final", "io.opencensus:opencensus-api:0.24.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0", "io.perfmark:perfmark-api:0.25.0", From ef88300c69311bc2253f51fce7f70754e4d344ab Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 31 Jan 2023 16:48:36 -0800 Subject: [PATCH 4/6] Upgrade Netty from 4.1.86 to 4.1.87 and tcnative from 2.0.54 to 2.0.56 --- SECURITY.md | 6 +++--- examples/example-tls/pom.xml | 2 +- examples/example-xds/build.gradle | 1 - gradle/libs.versions.toml | 4 ++-- repositories.bzl | 28 ++++++++++++++-------------- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 3aab8007c54..17996e70bb8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -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 @@ -412,8 +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-1.52.x | 4.1.79.Final | 2.0.54.Final -1.53.x- | 4.1.86.Final | 2.0.54.Final +1.50.x-1.52.x | 4.1.79.Final | 2.0.56.Final +1.53.x- | 4.1.87.Final | 2.0.56.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 685b600b2ca..f11f895f7a0 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -14,7 +14,7 @@ UTF-8 1.53.0-SNAPSHOT 3.21.7 - 2.0.54.Final + 2.0.56.Final 1.7 1.7 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index a0057a2f549..b8d04263c45 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -23,7 +23,6 @@ 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.53.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def nettyTcNativeVersion = '2.0.31.Final' def protocVersion = '3.21.7' dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7da120fc49..24d47a65dcc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,8 @@ autovalue = "1.9" checkstyle = "6.17" googleauth = "1.4.0" guava = "31.1-android" -netty = '4.1.86.Final' -nettytcnative = '2.0.54.Final' +netty = '4.1.87.Final' +nettytcnative = '2.0.56.Final' opencensus = "0.31.0" protobuf = "3.21.7" diff --git a/repositories.bzl b/repositories.bzl index 0d8ea192891..44c2cdf9f14 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -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.86.Final", - "io.netty:netty-codec-http2:4.1.86.Final", - "io.netty:netty-codec-http:4.1.86.Final", - "io.netty:netty-codec-socks:4.1.86.Final", - "io.netty:netty-codec:4.1.86.Final", - "io.netty:netty-common:4.1.86.Final", - "io.netty:netty-handler-proxy:4.1.86.Final", - "io.netty:netty-handler:4.1.86.Final", - "io.netty:netty-resolver:4.1.86.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.86.Final", - "io.netty:netty-transport-native-unix-common:4.1.86.Final", - "io.netty:netty-transport:4.1.86.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", From 78c85733974d420e12bde46cd345223cbd16d7dc Mon Sep 17 00:00:00 2001 From: larry-safran Date: Tue, 31 Jan 2023 16:55:26 -0800 Subject: [PATCH 5/6] fix previous tcnative version --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index 17996e70bb8..3e46c57e2f9 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -412,7 +412,7 @@ 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-1.52.x | 4.1.79.Final | 2.0.56.Final +1.50.x-1.52.x | 4.1.79.Final | 2.0.54.Final 1.53.x- | 4.1.87.Final | 2.0.56.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ From eae516b3aba64655aceb2450c49fe26feb293858 Mon Sep 17 00:00:00 2001 From: Larry Safran <107004254+larry-safran@users.noreply.github.com> Date: Mon, 6 Feb 2023 17:16:37 -0800 Subject: [PATCH 6/6] Update SECURITY.md --- SECURITY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 716834eb08b..54e610a8879 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -412,8 +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-1.52.x | 4.1.79.Final | 2.0.54.Final -1.53.x- | 4.1.87.Final | 2.0.56.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.)_