From 51155eb6147638e7eb016de7ff4a29eaf3e94051 Mon Sep 17 00:00:00 2001
From: yifeizhuang <zivy@google.com>
Date: Wed, 31 Aug 2022 16:02:27 -0700
Subject: [PATCH] netty: upgrade netty from 4.1.77.Final to 4.1.29.Final and
 tcnative from 2.0.53 to 2.0.54 (#9451)

---
 SECURITY.md                  |  3 ++-
 examples/example-tls/pom.xml |  2 +-
 gradle/libs.versions.toml    |  4 ++--
 repositories.bzl             | 28 ++++++++++++++--------------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index b78850f0804..1d36eb90103 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -411,7 +411,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
 1.35.x-1.41.x      | 4.1.52.Final          | 2.0.34.Final
 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-            | 4.1.77.Final          | 2.0.53.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
 
 _(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 3c9fe14d4fd..42b6d2d4594 100644
--- a/examples/example-tls/pom.xml
+++ b/examples/example-tls/pom.xml
@@ -14,7 +14,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.50.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
     <protoc.version>3.21.1</protoc.version>
-    <netty.tcnative.version>2.0.53.Final</netty.tcnative.version>
+    <netty.tcnative.version>2.0.54.Final</netty.tcnative.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c053c9d1bcc..3351eba9cb7 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.77.Final'
-nettytcnative = '2.0.53.Final'
+netty = '4.1.79.Final'
+nettytcnative = '2.0.54.Final'
 opencensus = "0.31.0"
 protobuf = "3.21.1"
 
diff --git a/repositories.bzl b/repositories.bzl
index bb9170a842b..cdf6d69e23e 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.77.Final",
-    "io.netty:netty-codec-http2:4.1.77.Final",
-    "io.netty:netty-codec-http:4.1.77.Final",
-    "io.netty:netty-codec-socks:4.1.77.Final",
-    "io.netty:netty-codec:4.1.77.Final",
-    "io.netty:netty-common:4.1.77.Final",
-    "io.netty:netty-handler-proxy:4.1.77.Final",
-    "io.netty:netty-handler:4.1.77.Final",
-    "io.netty:netty-resolver:4.1.77.Final",
-    "io.netty:netty-tcnative-boringssl-static:2.0.53.Final",
-    "io.netty:netty-tcnative-classes:2.0.53.Final",
-    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.77.Final",
-    "io.netty:netty-transport-native-unix-common:4.1.72.Final",
-    "io.netty:netty-transport:4.1.77.Final",
+    "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.opencensus:opencensus-api:0.24.0",
     "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
     "io.perfmark:perfmark-api:0.25.0",