From cfe398416da37216fd344735d2278eca2d623452 Mon Sep 17 00:00:00 2001
From: Muxian Wu <muxianw@twitter.com>
Date: Mon, 16 Oct 2023 03:35:48 +0000
Subject: [PATCH] Upgrade netty to 4.1.100

Problem/Solution: upgrade netty to 4.1.100

JIRA Issues: TFE-10183, VULN-23591

Differential Revision: https://phabricator.twitter.biz/D1104016
---
 CHANGELOG.rst | 2 ++
 build.sbt     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 021a0ba9c7..43fbe7a960 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,8 @@ New Features
 Runtime Behavior Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
+* finagle: Bump netty to 4.1.100 and netty-tcnative to 2.0.61.Final. ``PHAB_ID=D1104016``
+
 * finagle: Bump version of Jackson to 2.14.2. ``PHAB_ID=D1049772``
 
 * finagle: Update JSqlParser to version 4.6 ``PHAB_ID=D1054717``
diff --git a/build.sbt b/build.sbt
index 3822a5620d..c4a50f46ea 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,8 +8,8 @@ val releaseVersion = "23.9.0-SNAPSHOT"
 
 val libthriftVersion = "0.10.0"
 
-val defaultNetty4Version = "4.1.78.Final"
-val defaultNetty4StaticSslVersion = "2.0.53.Final"
+val defaultNetty4Version = "4.1.100.Final"
+val defaultNetty4StaticSslVersion = "2.0.61.Final"
 
 val useNettySnapshot: Boolean = sys.env.get("FINAGLE_USE_NETTY_4_SNAPSHOT") match {
   case Some(useSnapshot) => useSnapshot.toBoolean