This is an automated email from the ASF dual-hosted git repository.
ckj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new 7828558b1 [#1273] feat: add shaded module for spark3 client (#1279)
7828558b1 is described below
commit 7828558b1952943dd2c55b637463efc9608f24dc
Author: xianjingfeng <[email protected]>
AuthorDate: Mon Oct 30 21:18:32 2023 +0800
[#1273] feat: add shaded module for spark3 client (#1279)
### What changes were proposed in this pull request?
add shaded module for spark3 client
### Why are the changes needed?
Fix: #1273
### Does this PR introduce _any_ user-facing change?
spark3 shaded jar is renamed to rss-client-spark3-shaded-${version}.jar
### How was this patch tested?
CI
---
build_distribution.sh | 2 +-
client-spark/spark3-shaded/pom.xml | 165 +++++++++++++++++
.../src/main/resources/META-INF/LICENSE | 202 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 7 +
client-spark/spark3/pom.xml | 126 -------------
pom.xml | 8 +
6 files changed, 383 insertions(+), 127 deletions(-)
diff --git a/build_distribution.sh b/build_distribution.sh
index 8df540a0c..6f8e3d1a7 100755
--- a/build_distribution.sh
+++ b/build_distribution.sh
@@ -202,7 +202,7 @@ echo -e "\$ ${BUILD_COMMAND_SPARK3[@]}\n"
SPARK_CLIENT3_JAR_DIR="${CLIENT_JAR_DIR}/spark3"
mkdir -p $SPARK_CLIENT3_JAR_DIR
-SPARK_CLIENT3_JAR="${RSS_HOME}/client-spark/spark3/target/shaded/rss-client-spark3-${VERSION}-shaded.jar"
+SPARK_CLIENT3_JAR="${RSS_HOME}/client-spark/spark3-shaded/target/rss-client-spark3-shaded-${VERSION}.jar"
echo "copy $SPARK_CLIENT3_JAR to ${SPARK_CLIENT3_JAR_DIR}"
cp $SPARK_CLIENT3_JAR $SPARK_CLIENT3_JAR_DIR
diff --git a/client-spark/spark3-shaded/pom.xml
b/client-spark/spark3-shaded/pom.xml
new file mode 100644
index 000000000..163ea0a96
--- /dev/null
+++ b/client-spark/spark3-shaded/pom.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>uniffle-parent</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>rss-client-spark3-shaded</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Uniffle Shaded Client (Spark 3)</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uniffle</groupId>
+ <artifactId>rss-client-spark3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rss-client-spark3-shaded-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.uniffle:*</include>
+ <include>com.google.protobuf:*</include>
+ <include>com.google.code.gson:gson</include>
+ <include>io.grpc:*</include>
+ <include>com.google.android:annotations</include>
+ <include>io.perfmark:perfmark-api</include>
+ <include>io.netty:netty-all</include>
+
<include>com.google.api.grpc:proto-google-common-protos</include>
+
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
+ <include>com.google.guava:*</include>
+
<include>com.fasterxml.jackson.core:jackson-databind</include>
+ <include>com.fasterxml.jackson.core:jackson-core</include>
+
<include>com.fasterxml.jackson.core:jackson-annotations</include>
+ <include>org.roaringbitmap:RoaringBitmap</include>
+ <include>org.roaringbitmap:shims</include>
+ </includes>
+ </artifactSet>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <transformers>
+ <transformer
+
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer
+
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+ <transformer
+
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+ </transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+
<shadedPattern>${rss.shade.packageName}.com.google.protobuf</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.common</pattern>
+
<shadedPattern>${rss.shade.packageName}.com.google.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>google.protobuf</pattern>
+
<shadedPattern>${rss.shade.packageName}.google.protobuf</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson.core</pattern>
+
<shadedPattern>${rss.shade.packageName}.jackson.core</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson.databind</pattern>
+
<shadedPattern>${rss.shade.packageName}.jackson.databind</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson.annotation</pattern>
+
<shadedPattern>${rss.shade.packageName}.jackson.annotation</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>io.netty</pattern>
+
<shadedPattern>${rss.shade.packageName}.io.netty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.roaringbitmap</pattern>
+
<shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ <!-- shade the native netty libs as well -->
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <echo message="Shade netty native libraries to
${rss.shade.packageName}" />
+ <unzip src="${project.artifactId}-${project.version}.jar"
dest="${project.build.directory}/unpacked/" />
+ <echo message="renaming native epoll library"></echo>
+ <move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper from="libnetty_transport_native_epoll_x86_64.so"
+
to="lib${rss.shade.packageName}_shaded_netty_transport_native_epoll_x86_64.so"
+ type="glob"></mapper>
+ </move>
+ <move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper from="libnetty_transport_native_epoll_aarch_64.so"
+
to="lib${rss.shade.packageName}_shaded_netty_transport_native_epoll_aarch_64.so"
+ type="glob"></mapper>
+ </move>
+ <move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper from="libnetty_transport_native_kqueue_x86_64.jnilib"
+
to="lib${rss.shade.packageName}_shaded_netty_transport_native_kqueue_x86_64.jnilib"
+ type="glob"></mapper>
+ </move>
+ <echo message="repackaging netty jar"></echo>
+ <jar destfile="${project.artifactId}-${project.version}.jar"
basedir="${project.build.directory}/unpacked" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/client-spark/spark3-shaded/src/main/resources/META-INF/LICENSE
b/client-spark/spark3-shaded/src/main/resources/META-INF/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/client-spark/spark3-shaded/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/client-spark/spark3-shaded/src/main/resources/META-INF/NOTICE
b/client-spark/spark3-shaded/src/main/resources/META-INF/NOTICE
new file mode 100644
index 000000000..2cfb9fb7c
--- /dev/null
+++ b/client-spark/spark3-shaded/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,7 @@
+Apache Uniffle (incubating)
+Copyright 2022 and onwards The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+The initial codebase was donated to the ASF by Tencent, copyright 2020-2022.
diff --git a/client-spark/spark3/pom.xml b/client-spark/spark3/pom.xml
index f39d20773..09ee6b3a9 100644
--- a/client-spark/spark3/pom.xml
+++ b/client-spark/spark3/pom.xml
@@ -87,130 +87,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>rss-client-spark3-jar</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/shaded</outputDirectory>
-
<shadedArtifactAttached>true</shadedArtifactAttached>
- <artifactSet>
- <includes>
- <include>org.apache.uniffle:*</include>
- <include>com.google.protobuf:*</include>
-
<include>com.google.code.gson:gson</include>
- <include>io.grpc:*</include>
-
<include>com.google.android:annotations</include>
- <include>io.perfmark:perfmark-api</include>
- <include>io.netty:netty-all</include>
-
<include>com.google.api.grpc:proto-google-common-protos</include>
-
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
- <include>com.google.guava:*</include>
-
<include>com.fasterxml.jackson.core:jackson-databind</include>
-
<include>com.fasterxml.jackson.core:jackson-core</include>
-
<include>com.fasterxml.jackson.core:jackson-annotations</include>
-
<include>org.roaringbitmap:RoaringBitmap</include>
- <include>org.roaringbitmap:shims</include>
- </includes>
- </artifactSet>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
- </transformers>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>LICENSE</exclude>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- <relocations>
- <relocation>
- <pattern>com.google.protobuf</pattern>
-
<shadedPattern>${rss.shade.packageName}.com.google.protobuf</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google.common</pattern>
-
<shadedPattern>${rss.shade.packageName}.com.google.common</shadedPattern>
- </relocation>
- <relocation>
- <pattern>google.protobuf</pattern>
-
<shadedPattern>${rss.shade.packageName}.google.protobuf</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.core</pattern>
-
<shadedPattern>${rss.shade.packageName}.jackson.core</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.databind</pattern>
-
<shadedPattern>${rss.shade.packageName}.jackson.databind</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml.jackson.annotation</pattern>
-
<shadedPattern>${rss.shade.packageName}.jackson.annotation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>io.netty</pattern>
-
<shadedPattern>${rss.shade.packageName}.io.netty</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.roaringbitmap</pattern>
-
<shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- <!-- shade the native netty libs as well -->
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <configuration>
- <target>
- <echo message="Shade netty native libraries to
${rss.shade.packageName}" />
- <unzip src="${artifactId}-${version}.jar"
dest="${project.build.directory}/unpacked/" />
- <echo message="renaming native epoll
library"></echo>
- <move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
- <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
- <mapper
from="libnetty_transport_native_epoll_x86_64.so"
-
to="lib${rss.shade.packageName}_shaded_netty_transport_native_epoll_x86_64.so"
- type="glob"></mapper>
- </move>
- <move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
- <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
- <mapper
from="libnetty_transport_native_epoll_aarch_64.so"
-
to="lib${rss.shade.packageName}_shaded_netty_transport_native_epoll_aarch_64.so"
- type="glob"></mapper>
- </move>
- <move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
- <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
- <mapper
from="libnetty_transport_native_kqueue_x86_64.jnilib"
-
to="lib${rss.shade.packageName}_shaded_netty_transport_native_kqueue_x86_64.jnilib"
- type="glob"></mapper>
- </move>
- <echo message="repackaging netty jar"></echo>
- <jar destfile="${artifactId}-${version}.jar"
basedir="${project.build.directory}/unpacked" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/pom.xml b/pom.xml
index 808e5b2ac..8a729aed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,7 @@
<module>client</module>
<module>integration-test/common</module>
<module>cli</module>
+ <module>client-spark/spark3-shaded</module>
</modules>
<dependencies>
@@ -1319,6 +1320,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
@@ -1399,6 +1401,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
@@ -1488,6 +1491,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
@@ -1578,6 +1582,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
@@ -1668,6 +1673,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
@@ -1757,6 +1763,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
@@ -1846,6 +1853,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark3</module>
+ <module>client-spark/spark3-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark3</module>
</modules>
