Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MINOR] chore: Fix the issue of license loss #2246

Merged
merged 3 commits into from
Nov 12, 2024
Merged

[MINOR] chore: Fix the issue of license loss #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
082756a
[MINOR] chore: Fix the issue of license loss
zhengchenyu Nov 11, 2024
b7f42cb
fix
zhengchenyu Nov 11, 2024
ee605ef
fix
zhengchenyu Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions client-spark/spark2-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
<pattern>org.roaringbitmap</pattern>
<shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern>
</relocation>
<relocation>
<pattern>META-INF/license</pattern>
<shadedPattern>META-INF/license-tmp</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down Expand Up @@ -213,6 +217,22 @@
to="lib${rss.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib"
type="glob"></mapper>
</move>
<!-- Since it may be compiled on case-insensitive operating system, it may be executed multiple times.
Here the license directory, licenses directory, and LICENSE file are processed with aliases. -->
<move failonerror="false" quiet="true"
todir="${project.build.directory}/unpacked/META-INF/license-tmps">
<fileset dir="${project.build.directory}/unpacked/META-INF/license-tmp">
<include name="LICENSE*.txt"/>
</fileset>
</move>
<delete failonerror="false" quiet="true"
dir="${project.build.directory}/unpacked/META-INF/license-tmp"/>
<move failonerror="false" quiet="true"
file="${project.build.directory}/unpacked/META-INF/license-tmps"
tofile="${project.build.directory}/unpacked/META-INF/licenses"/>
<move failonerror="false" quiet="true"
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"/>
Expand Down
20 changes: 20 additions & 0 deletions client-spark/spark3-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
<pattern>org.roaringbitmap</pattern>
<shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern>
</relocation>
<relocation>
<pattern>META-INF/license</pattern>
<shadedPattern>META-INF/license-tmp</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down Expand Up @@ -213,6 +217,22 @@
to="lib${rss.shade.native.packageName}_netty_transport_native_kqueue_aarch_64.jnilib"
type="glob"></mapper>
</move>
<!-- Since it may be compiled on case-insensitive operating system, it may be executed multiple times.
Here the license directory, licenses directory, and LICENSE file are processed with aliases. -->
<move failonerror="false" quiet="true"
todir="${project.build.directory}/unpacked/META-INF/license-tmps">
<fileset dir="${project.build.directory}/unpacked/META-INF/license-tmp">
<include name="LICENSE*.txt"/>
</fileset>
</move>
<delete failonerror="false" quiet="true"
dir="${project.build.directory}/unpacked/META-INF/license-tmp"/>
<move failonerror="false" quiet="true"
file="${project.build.directory}/unpacked/META-INF/license-tmps"
tofile="${project.build.directory}/unpacked/META-INF/licenses"/>
<move failonerror="false" quiet="true"
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"/>
Expand Down
4 changes: 2 additions & 2 deletions release/publish_maven_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Loading