From ca5d32bbfa4c99abc9692aa75a94397be8df7c8b Mon Sep 17 00:00:00 2001 From: zhengchenyu Date: Tue, 12 Nov 2024 14:36:35 +0800 Subject: [PATCH] [MINOR] chore: Fix the issue of license loss (#2246) ### What changes were proposed in this pull request? Fix the issue of license loss ### Why are the changes needed? LICENSE file is missing but license directory which is from grpc-netty-shaded-1.61.1.jar exists. And when published maven artifacts, I can not close. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? test in dev and cluster --- client-spark/spark2-shaded/pom.xml | 20 ++++++++++++++++++++ client-spark/spark3-shaded/pom.xml | 20 ++++++++++++++++++++ release/publish_maven_artifacts.sh | 4 ++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/client-spark/spark2-shaded/pom.xml b/client-spark/spark2-shaded/pom.xml index 6cb6749979..85f9933b55 100644 --- a/client-spark/spark2-shaded/pom.xml +++ b/client-spark/spark2-shaded/pom.xml @@ -123,6 +123,10 @@ org.roaringbitmap ${rss.shade.packageName}.org.roaringbitmap + + META-INF/license + META-INF/license-tmp + @@ -213,6 +217,22 @@ to="lib${rss.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" type="glob"> + + + + + + + + + diff --git a/client-spark/spark3-shaded/pom.xml b/client-spark/spark3-shaded/pom.xml index 078980aa7c..0732253472 100644 --- a/client-spark/spark3-shaded/pom.xml +++ b/client-spark/spark3-shaded/pom.xml @@ -123,6 +123,10 @@ org.roaringbitmap ${rss.shade.packageName}.org.roaringbitmap + + META-INF/license + META-INF/license-tmp + @@ -213,6 +217,22 @@ to="lib${rss.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib" type="glob"> + + + + + + + + + diff --git a/release/publish_maven_artifacts.sh b/release/publish_maven_artifacts.sh index c650571429..4ca29bdf1d 100755 --- 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"