[MINOR] chore: Fix the issue of license loss

apache · Nov 11, 2024 · 082756a · 082756a
1 parent 06cbcef
commit 082756a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/client-spark/spark2-shaded/pom.xml b/client-spark/spark2-shaded/pom.xml
@@ -213,6 +213,9 @@
                           to="lib${rss.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib"
                           type="glob"></mapper>
                 </move>
+                <delete dir="${project.build.directory}/unpacked/META-INF/license"/>
+                <move file="${project.build.directory}/unpacked/META-INF/LICENSE-binary"
+                      tofile="${project.build.directory}/unpacked/META-INF/LICENSE"/>
                 <!-- Delete our NettyUtils to avoid errors like NoSuchMethodError, let Spark use its own NettyUtils -->
                 <!-- See https://github.com/apache/incubator-uniffle/pull/1565 for more details -->
                 <delete dir="${project.build.directory}/unpacked/org/apache/spark/network"/>

diff --git a/client-spark/spark3-shaded/pom.xml b/client-spark/spark3-shaded/pom.xml
@@ -213,6 +213,9 @@
                           to="lib${rss.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib"
                           type="glob"></mapper>
                 </move>
+                <delete dir="${project.build.directory}/unpacked/META-INF/license"/>
+                <move file="${project.build.directory}/unpacked/META-INF/LICENSE-binary"
+                      tofile="${project.build.directory}/unpacked/META-INF/LICENSE"/>
                 <echo message="repackaging netty jar"></echo>
                 <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
                      basedir="${project.build.directory}/unpacked"/>

diff --git a/release/publish_maven_artifacts.sh b/release/publish_maven_artifacts.sh
@@ -51,7 +51,7 @@ copy_license_files() {
   cp -f "${PROJECT_DIR}/NOTICE-binary" \
   "${PROJECT_DIR}/client-spark/spark2-shaded/src/main/resources/META-INF/NOTICE"
   cp -f "${PROJECT_DIR}/LICENSE-binary" \
-  "${PROJECT_DIR}/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE"
+  "${PROJECT_DIR}/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE-binary"
   rm -rf "${PROJECT_DIR}/client-spark/spark2-shaded/src/main/resources/META-INF/licenses"
   cp -rf "${PROJECT_DIR}/licenses-binary" \
   "${PROJECT_DIR}/client-spark/spark2-shaded/src/main/resources/META-INF/licenses"
@@ -60,7 +60,7 @@ copy_license_files() {
   cp -f "${PROJECT_DIR}/NOTICE-binary" \
     "${PROJECT_DIR}/client-spark/spark3-shaded/src/main/resources/META-INF/NOTICE"
   cp -f "${PROJECT_DIR}/LICENSE-binary" \
-    "${PROJECT_DIR}/client-spark/spark3-shaded/src/main/resources/META-INF/LICENSE"
+    "${PROJECT_DIR}/client-spark/spark3-shaded/src/main/resources/META-INF/LICENSE-binary"
   rm -rf "${PROJECT_DIR}/client-spark/spark3-shaded/src/main/resources/META-INF/licenses"
   cp -rf "${PROJECT_DIR}/licenses-binary" \
     "${PROJECT_DIR}/client-spark/spark3-shaded/src/main/resources/META-INF/licenses"