From 27a6ef3ea8ba7362c8cbe2b6593341058e1b3153 Mon Sep 17 00:00:00 2001
From: Stefan Miklosovic <smiklosovic@apache.org>
Date: Tue, 1 Apr 2025 13:33:49 +0200
Subject: [PATCH] Update netty to 4.1.119.Final and netty-tcnative to
 2.0.70.Final

patch by Stefan Miklosovic; reviewed by Dmitry Konstantinov for CASSANDRA-20314
---
 .build/build-resolver.xml      |  4 ++--
 .build/parent-pom-template.xml | 10 +++++-----
 CHANGES.txt                    |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml
index 55718377e2..09263d42aa 100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@ -275,8 +275,8 @@
         <delete file="${build.lib}/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar" failonerror="false"/>
         <delete file="${build.lib}/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar" failonerror="false"/>
 
-        <delete file="${build.lib}/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar" failonerror="false"/>
-        <delete file="${build.dir.lib}/jars/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar" failonerror="false"/>
+        <delete file="${build.lib}/netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar" failonerror="false"/>
+        <delete file="${build.dir.lib}/jars/netty-tcnative-boringssl-static-2.0.70.Final-windows-x86_64.jar" failonerror="false"/>
     </target>
 
     <target name="_resolver-dist-lib_get_files">
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 5e873eae2b..cb15badbb9 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -729,7 +729,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
-        <version>4.1.96.Final</version>
+        <version>4.1.119.Final</version>
         <exclusions>
           <exclusion>
             <groupId>io.netty</groupId>
@@ -800,7 +800,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-tcnative-boringssl-static</artifactId>
-        <version>2.0.61.Final</version>
+        <version>2.0.70.Final</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
@@ -823,18 +823,18 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
-        <version>4.1.96.Final</version>
+        <version>4.1.119.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
-        <version>4.1.96.Final</version>
+        <version>4.1.119.Final</version>
         <classifier>linux-x86_64</classifier>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
-        <version>4.1.96.Final</version>
+        <version>4.1.119.Final</version>
         <classifier>linux-aarch_64</classifier>
       </dependency>
 
diff --git a/CHANGES.txt b/CHANGES.txt
index c9dbd21a4f..31ad210e4e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 5.0.4
+ * Update netty to 4.1.119.Final and netty-tcnative to 2.0.70.Final (CASSANDRA-20314)
  * Serialization can lose complex deletions in a mutation with multiple collections in a row (CASSANDRA-20449)
  * Improve error messages when initializing auth classes (CASSANDRA-20368)
  * Prioritize legacy 2i over SAI for columns with multiple indexes (CASSANDRA-20334)