From 31b0e9b6b94a67cbdb42a7b4741ef85d38ea49b8 Mon Sep 17 00:00:00 2001
From: Hasnain Lakhani <hasnain.lakhani@databricks.com>
Date: Sun, 8 Oct 2023 15:49:50 -0700
Subject: [PATCH 1/3] working

---
 common/network-yarn/pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index 5661a1d59a6b..1c5132b6063e 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -174,7 +174,18 @@
             <configuration>
                 <target>
                     <echo message="Shade netty native libraries to ${spark.shade.native.packageName}" />
-                    <unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/" />
+                    <!-- 
+                      We have a LICENSE file with apache licenses and license directory for netty-tcnative licenses. This breaks
+                      packaging on OSX where filesystems are case insensitive. So, create the directory, which results
+                      in the LICENSE file not being written, letting the netty licenses be copied over.
+                      LICENSE.txt also contains the apache license so this should be OK 
+                    -->
+                    <mkdir dir="${project.build.directory}/exploded/META-INF/LICENSE" />
+                    <unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/">
+                      <patternset>
+                          <exclude name="META-INF/LICENSE"/>
+                      </patternset>
+                    </unzip>
                     <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
                           tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so" />
                     <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"

From f47370b8678cb505cb86e62019be3255675a03e3 Mon Sep 17 00:00:00 2001
From: Hasnain Lakhani <hasnain.lakhani@databricks.com>
Date: Sun, 8 Oct 2023 23:38:24 -0700
Subject: [PATCH 2/3] rework

---
 common/network-yarn/pom.xml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index 1c5132b6063e..3f2385153397 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -110,6 +110,7 @@
                 <exclude>META-INF/*.SF</exclude>
                 <exclude>META-INF/*.DSA</exclude>
                 <exclude>META-INF/*.RSA</exclude>
+                <exclude>META-INF/license/*</exclude>
               </excludes>
             </filter>
           </filters>
@@ -174,18 +175,7 @@
             <configuration>
                 <target>
                     <echo message="Shade netty native libraries to ${spark.shade.native.packageName}" />
-                    <!-- 
-                      We have a LICENSE file with apache licenses and license directory for netty-tcnative licenses. This breaks
-                      packaging on OSX where filesystems are case insensitive. So, create the directory, which results
-                      in the LICENSE file not being written, letting the netty licenses be copied over.
-                      LICENSE.txt also contains the apache license so this should be OK 
-                    -->
-                    <mkdir dir="${project.build.directory}/exploded/META-INF/LICENSE" />
-                    <unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/">
-                      <patternset>
-                          <exclude name="META-INF/LICENSE"/>
-                      </patternset>
-                    </unzip>
+                    <unzip src="${shuffle.jar}" dest="${project.build.directory}/exploded/" />
                     <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_epoll_x86_64.so"
                           tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_x86_64.so" />
                     <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"
@@ -194,6 +184,14 @@
                           tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so" />
                     <move file="${project.build.directory}/exploded/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"
                           tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" />
+                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_x86_64.so"
+                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_x86_64.so" />
+                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_linux_aarch_64.so"
+                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_linux_aarch_64.so" />
+                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
+                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_x86_64.jnilib" />
+                    <move file="${project.build.directory}/exploded/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib"
+                          tofile="${project.build.directory}/exploded/META-INF/native/lib${spark.shade.native.packageName}_netty_tcnative_osx_aarch_64.jnilib" />
                     <jar destfile="${shuffle.jar}" basedir="${project.build.directory}/exploded" />
                 </target>
             </configuration>

From c47bd23197423efe5f2aa24a30880ca335a03c22 Mon Sep 17 00:00:00 2001
From: Hasnain Lakhani <hasnain.lakhani@databricks.com>
Date: Mon, 9 Oct 2023 07:41:22 -0700
Subject: [PATCH 3/3] keep license folder not file

---
 common/network-yarn/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index 3f2385153397..c809bdfbbc1d 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -110,7 +110,7 @@
                 <exclude>META-INF/*.SF</exclude>
                 <exclude>META-INF/*.DSA</exclude>
                 <exclude>META-INF/*.RSA</exclude>
-                <exclude>META-INF/license/*</exclude>
+                <exclude>META-INF/LICENSE</exclude>
               </excludes>
             </filter>
           </filters>