From 2db2374f0baba80f1dd3793457064de4aef5a7c5 Mon Sep 17 00:00:00 2001
From: sarangat_LinkedIn <sarangath@linkedin.com>
Date: Mon, 3 Nov 2025 15:33:31 -0800
Subject: [PATCH 1/3] introduce netty

---
 dev/mvn-build-helper/assembly/pom.xml | 15 +++++++++++++++
 pom.xml                               | 23 ++++++++++++++++++++++-
 spark-extension/pom.xml               | 13 +++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/dev/mvn-build-helper/assembly/pom.xml b/dev/mvn-build-helper/assembly/pom.xml
index e34b3f91c..f94e971b2 100644
--- a/dev/mvn-build-helper/assembly/pom.xml
+++ b/dev/mvn-build-helper/assembly/pom.xml
@@ -44,6 +44,16 @@
       <artifactId>${shimPkg}_${scalaVersion}</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${nettyVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>${nettyVersion}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -107,6 +117,11 @@
                     <exclude>org.apache.arrow.c.**</exclude>
                   </excludes>
                 </relocation>
+                <!-- Shade Netty to avoid conflicts with runtime shaded Spark -->
+                <relocation>
+                  <pattern>io.netty</pattern>
+                  <shadedPattern>${auron.shade.packageName}.io.netty</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>javax.annotation</pattern>
                   <shadedPattern>${auron.shade.packageName}.javax.annotation</shadedPattern>
diff --git a/pom.xml b/pom.xml
index 775f61764..9a64a5186 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <bytebuddyVersion>1.14.11</bytebuddyVersion>
     <hadoopVersion>3.4.2</hadoopVersion>
     <protobufVersion>3.25.5</protobufVersion>
-
+    <nettyVersion>4.1.118.Final</nettyVersion>
     <javaVersion>8</javaVersion>
     <scalaVersion>2.12</scalaVersion>
     <scalaLongVersion>2.12.18</scalaLongVersion>
@@ -128,6 +128,12 @@
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-core_${scalaVersion}</artifactId>
         <version>${sparkVersion}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
@@ -145,6 +151,10 @@
         <artifactId>spark-sql_${scalaVersion}</artifactId>
         <version>${sparkVersion}</version>
         <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>org.apache.arrow</groupId>
             <artifactId>*</artifactId>
@@ -292,6 +302,17 @@
             <artifactId>jsr305</artifactId>
             <version>2.0.2</version>
           </dependency>
+          <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${nettyVersion}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler-ssl-ocsp</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
         </dependencies>
         <executions>
           <execution>
diff --git a/spark-extension/pom.xml b/spark-extension/pom.xml
index d634e9414..94e524540 100644
--- a/spark-extension/pom.xml
+++ b/spark-extension/pom.xml
@@ -95,6 +95,19 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- Netty needed for compile-time (SpillBuf, etc.); runtime comes from shaded assembly -->
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${nettyVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>${nettyVersion}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
 </project>

From db8ed15d09727f9590a84a721513282e5b8a4148 Mon Sep 17 00:00:00 2001
From: sarangat_LinkedIn <sarangath@linkedin.com>
Date: Mon, 3 Nov 2025 15:37:12 -0800
Subject: [PATCH 2/3] cleanup comments

---
 dev/mvn-build-helper/assembly/pom.xml | 1 -
 spark-extension/pom.xml               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev/mvn-build-helper/assembly/pom.xml b/dev/mvn-build-helper/assembly/pom.xml
index f94e971b2..510215395 100644
--- a/dev/mvn-build-helper/assembly/pom.xml
+++ b/dev/mvn-build-helper/assembly/pom.xml
@@ -117,7 +117,6 @@
                     <exclude>org.apache.arrow.c.**</exclude>
                   </excludes>
                 </relocation>
-                <!-- Shade Netty to avoid conflicts with runtime shaded Spark -->
                 <relocation>
                   <pattern>io.netty</pattern>
                   <shadedPattern>${auron.shade.packageName}.io.netty</shadedPattern>
diff --git a/spark-extension/pom.xml b/spark-extension/pom.xml
index 94e524540..0d6cf7c1e 100644
--- a/spark-extension/pom.xml
+++ b/spark-extension/pom.xml
@@ -95,7 +95,6 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- Netty needed for compile-time (SpillBuf, etc.); runtime comes from shaded assembly -->
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>

From a41323a5fe44f1441e5386d7f2d60ac6b9f685a3 Mon Sep 17 00:00:00 2001
From: sarangat_LinkedIn <sarangath@linkedin.com>
Date: Tue, 4 Nov 2025 07:40:45 -0800
Subject: [PATCH 3/3] address comments

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a64a5186..03e6279ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <bytebuddyVersion>1.14.11</bytebuddyVersion>
     <hadoopVersion>3.4.2</hadoopVersion>
     <protobufVersion>3.25.5</protobufVersion>
-    <nettyVersion>4.1.118.Final</nettyVersion>
+    <nettyVersion>4.2.7.Final</nettyVersion>
     <javaVersion>8</javaVersion>
     <scalaVersion>2.12</scalaVersion>
     <scalaLongVersion>2.12.18</scalaLongVersion>
@@ -590,6 +590,7 @@
         <scalaTestVersion>3.0.8</scalaTestVersion>
         <sparkVersion>3.0.3</sparkVersion>
         <shortSparkVersion>3.0</shortSparkVersion>
+        <nettyVersion>4.1.47.Final</nettyVersion>
       </properties>
     </profile>
 
@@ -601,6 +602,7 @@
         <scalaTestVersion>3.2.9</scalaTestVersion>
         <sparkVersion>3.1.3</sparkVersion>
         <shortSparkVersion>3.1</shortSparkVersion>
+        <nettyVersion>4.1.51.Final</nettyVersion>
       </properties>
     </profile>
 
@@ -612,6 +614,7 @@
         <scalaTestVersion>3.2.9</scalaTestVersion>
         <sparkVersion>3.2.4</sparkVersion>
         <shortSparkVersion>3.2</shortSparkVersion>
+        <nettyVersion>4.1.68.Final</nettyVersion>
       </properties>
     </profile>
 
@@ -623,6 +626,7 @@
         <scalaTestVersion>3.2.9</scalaTestVersion>
         <sparkVersion>3.3.4</sparkVersion>
         <shortSparkVersion>3.3</shortSparkVersion>
+        <nettyVersion>4.1.74.Final</nettyVersion>
       </properties>
     </profile>
 
@@ -634,6 +638,7 @@
         <scalaTestVersion>3.2.9</scalaTestVersion>
         <sparkVersion>3.4.4</sparkVersion>
         <shortSparkVersion>3.4</shortSparkVersion>
+        <nettyVersion>4.1.87.Final</nettyVersion>
       </properties>
     </profile>
 
@@ -645,6 +650,7 @@
         <scalaTestVersion>3.2.9</scalaTestVersion>
         <sparkVersion>3.5.7</sparkVersion>
         <shortSparkVersion>3.5</shortSparkVersion>
+        <nettyVersion>4.1.96.Final</nettyVersion>
       </properties>
     </profile>