You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by xi...@apache.org on 2023/10/31 06:43:48 UTC
(incubator-uniffle) branch branch-0.8 updated (bb5676832 -> 876990fbf)
This is an automated email from the ASF dual-hosted git repository.
xianjingfeng pushed a change to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
from bb5676832 [#1252] fix(server): Incorrect storage write fail metric (#1253)
new 5b57bf34a [#1277] chore: add flatten maven plugin (#1278)
new 4fde8004f [#1273] feat: add shaded module for spark3 client (#1279)
new e7cf955bf [#1274] feat: add shaded module for spark2 client (#1280)
new 876990fbf [#1275] chore: add scripts for publishing maven releases (#1281)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
build_distribution.sh | 4 +-
client-mr/core/pom.xml | 5 +-
client-spark/{spark2 => spark2-shaded}/pom.xml | 71 ++--------
.../src/main/resources/META-INF/LICENSE | 0
.../src/main/resources/META-INF/NOTICE | 0
client-spark/spark2/pom.xml | 132 +----------------
client-spark/{spark2 => spark3-shaded}/pom.xml | 71 ++--------
.../src/main/resources/META-INF/LICENSE | 0
.../src/main/resources/META-INF/NOTICE | 0
client-spark/spark3/pom.xml | 131 +----------------
client-tez/pom.xml | 8 ++
integration-test/mr/pom.xml | 2 +
integration-test/spark-common/pom.xml | 4 +
integration-test/spark2/pom.xml | 21 +--
integration-test/spark3/pom.xml | 5 +-
integration-test/tez/pom.xml | 5 +
pom.xml | 157 +++++++++++++++++++++
spotbugs-exclude.xml => release/asf-settings.xml | 25 ++--
release/publish_maven_artifacts.sh | 48 +++++++
20 files changed, 281 insertions(+), 409 deletions(-)
copy client-spark/{spark2 => spark2-shaded}/pom.xml (76%)
copy LICENSE => client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE (100%)
copy NOTICE => client-spark/spark2-shaded/src/main/resources/META-INF/NOTICE (100%)
copy client-spark/{spark2 => spark3-shaded}/pom.xml (76%)
copy LICENSE => client-spark/spark3-shaded/src/main/resources/META-INF/LICENSE (100%)
copy NOTICE => client-spark/spark3-shaded/src/main/resources/META-INF/NOTICE (100%)
copy spotbugs-exclude.xml => release/asf-settings.xml (56%)
create mode 100755 release/publish_maven_artifacts.sh
(incubator-uniffle) 03/04: [#1274] feat: add shaded module for spark2 client (#1280)
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xianjingfeng pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
commit e7cf955bf6171ead2d1e86efac68401900b87fea
Author: xianjingfeng <xi...@gmail.com>
AuthorDate: Tue Oct 31 10:56:46 2023 +0800
[#1274] feat: add shaded module for spark2 client (#1280)
### What changes were proposed in this pull request?
add shaded module for spark2 client
### Why are the changes needed?
Fix: #1274
### Does this PR introduce any user-facing change?
spark2 shaded jar is renamed to rss-client-spark2-shaded-${version}.jar
### How was this patch tested?
CI
(cherry picked from commit 576f7cb65f336dadd999de57dd8b644f21f055e4)
---
build_distribution.sh | 2 +-
client-spark/{spark2 => spark2-shaded}/pom.xml | 66 +------
.../src/main/resources/META-INF/LICENSE | 202 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 7 +
client-spark/spark2/pom.xml | 127 -------------
pom.xml | 3 +-
6 files changed, 220 insertions(+), 187 deletions(-)
diff --git a/build_distribution.sh b/build_distribution.sh
index 6f8e3d1a7..a15f0ae9a 100755
--- a/build_distribution.sh
+++ b/build_distribution.sh
@@ -190,7 +190,7 @@ echo -e "\$ ${BUILD_COMMAND_SPARK2[@]}\n"
SPARK_CLIENT2_JAR_DIR="${CLIENT_JAR_DIR}/spark2"
mkdir -p $SPARK_CLIENT2_JAR_DIR
-SPARK_CLIENT2_JAR="${RSS_HOME}/client-spark/spark2/target/shaded/rss-client-spark2-${VERSION}-shaded.jar"
+SPARK_CLIENT2_JAR="${RSS_HOME}/client-spark/spark2-shaded/target/rss-client-spark2-shaded-${VERSION}.jar"
echo "copy $SPARK_CLIENT2_JAR to ${SPARK_CLIENT2_JAR_DIR}"
cp $SPARK_CLIENT2_JAR ${SPARK_CLIENT2_JAR_DIR}
diff --git a/client-spark/spark2/pom.xml b/client-spark/spark2-shaded/pom.xml
similarity index 78%
copy from client-spark/spark2/pom.xml
copy to client-spark/spark2-shaded/pom.xml
index e5ba9d220..471926234 100644
--- a/client-spark/spark2/pom.xml
+++ b/client-spark/spark2-shaded/pom.xml
@@ -15,75 +15,27 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>rss-client-spark2</artifactId>
+ <artifactId>rss-client-spark2-shaded</artifactId>
<packaging>jar</packaging>
- <name>Apache Uniffle Client (Spark 2)</name>
+ <name>Apache Uniffle Shaded Client (Spark 2)</name>
<dependencies>
<dependency>
<groupId>org.apache.uniffle</groupId>
- <artifactId>rss-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.uniffle</groupId>
- <artifactId>rss-client-spark-common</artifactId>
+ <artifactId>rss-client-spark2</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.binary.version}</artifactId>
- <version>${spark.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.uniffle</groupId>
- <artifactId>shuffle-storage</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.uniffle</groupId>
- <artifactId>rss-client-spark-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -93,14 +45,12 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>rss-client-spark2-jar</id>
+ <id>rss-client-spark2-shaded-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>
diff --git a/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE b/client-spark/spark2-shaded/src/main/resources/META-INF/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/client-spark/spark2-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/spark2-shaded/src/main/resources/META-INF/NOTICE b/client-spark/spark2-shaded/src/main/resources/META-INF/NOTICE
new file mode 100644
index 000000000..2cfb9fb7c
--- /dev/null
+++ b/client-spark/spark2-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/spark2/pom.xml b/client-spark/spark2/pom.xml
index e5ba9d220..62ecce27c 100644
--- a/client-spark/spark2/pom.xml
+++ b/client-spark/spark2/pom.xml
@@ -85,131 +85,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>rss-client-spark2-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="${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/pom.xml b/pom.xml
index 38beb7810..73d12279f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,6 @@
<module>client</module>
<module>integration-test/common</module>
<module>cli</module>
- <module>client-spark/spark3-shaded</module>
</modules>
<dependencies>
@@ -1203,6 +1202,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark2</module>
+ <module>client-spark/spark2-shaded</module>
<module>integration-test/spark-common</module>
<module>integration-test/spark2</module>
</modules>
@@ -1262,6 +1262,7 @@
<modules>
<module>client-spark/common</module>
<module>client-spark/spark2</module>
+ <module>client-spark/spark2-shaded</module>
<module>integration-test/spark-common</module>
</modules>
<dependencyManagement>
(incubator-uniffle) 04/04: [#1275] chore: add scripts for publishing maven releases (#1281)
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xianjingfeng pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
commit 876990fbf6f776a5a2cd94750cd5f45491637140
Author: xianjingfeng <xi...@gmail.com>
AuthorDate: Tue Oct 31 14:15:38 2023 +0800
[#1275] chore: add scripts for publishing maven releases (#1281)
### What changes were proposed in this pull request?
add scripts for publishing maven releases
### Why are the changes needed?
Fix: #1275
### Does this PR introduce any user-facing change?
No.
### How was this patch tested?
CI
(cherry picked from commit 1e31dd74424b610e697487d78598a7375f889506)
---
pom.xml | 121 +++++++++++++++++++++++++++++++++++++
release/asf-settings.xml | 34 +++++++++++
release/publish_maven_artifacts.sh | 48 +++++++++++++++
3 files changed, 203 insertions(+)
diff --git a/pom.xml b/pom.xml
index 73d12279f..710480f55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,26 @@
<version>18</version>
</parent>
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>${distMgmtReleasesName}</name>
+ <url>${distMgmtReleasesUrl}</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<properties>
+ <distMgmtReleasesName>Apache Release Distribution Repository</distMgmtReleasesName>
+ <distMgmtReleasesUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtReleasesUrl>
+ <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+ <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+ <version.apache-resource-bundles>1.5</version.apache-resource-bundles>
+ <version.checksum-maven-plugin>1.11</version.checksum-maven-plugin>
<awaitility.version>4.2.0</awaitility.version>
<checkstyle.version>9.3</checkstyle.version>
<commons-logging.version>1.2</commons-logging.version>
@@ -2080,5 +2099,107 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <!-- Create a source-release artifact that contains the fully buildable
+ project directory source structure. This is the artifact which is
+ the official subject of any release vote. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>${version.apache-resource-bundles}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>${assembly.tarLongFileMode}</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- calculate checksums of source release for Apache dist area -->
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>${version.checksum-maven-plugin}</version>
+ <executions>
+ <execution>
+ <id>source-release-checksum</id>
+ <goals>
+ <goal>artifacts</goal>
+ </goals>
+ <!-- execute prior to maven-gpg-plugin:sign due to https://github.com/nicoulaj/checksum-maven-plugin/issues/112 -->
+ <phase>post-integration-test</phase>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <!-- https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor -->
+ <includeClassifiers>source-release</includeClassifiers>
+ <excludeMainArtifact>true</excludeMainArtifact>
+ <csvSummary>false</csvSummary>
+ <!-- attach SHA-512 checksum as well to upload to Maven Staging Repo,
+ as this eases uploading from stage to dist and doesn't do harm in Maven Central -->
+ <attachChecksums>true</attachChecksums>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- We want to sign the artifact, the POM, and all attached artifacts (except for SHA-512 checksum) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-release-artifacts</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/release/asf-settings.xml b/release/asf-settings.xml
new file mode 100644
index 000000000..b6388f7e6
--- /dev/null
+++ b/release/asf-settings.xml
@@ -0,0 +1,34 @@
+<?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.
+ -->
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>apache.snapshots.https</id>
+ <username>${env.ASF_USERNAME}</username>
+ <password>${env.ASF_PASSWORD}</password>
+ </server>
+ <server>
+ <id>apache.releases.https</id>
+ <username>${env.ASF_USERNAME}</username>
+ <password>${env.ASF_PASSWORD}</password>
+ </server>
+ </servers>
+</settings>
diff --git a/release/publish_maven_artifacts.sh b/release/publish_maven_artifacts.sh
new file mode 100755
index 000000000..322a4a90c
--- /dev/null
+++ b/release/publish_maven_artifacts.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+#
+# 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.
+#
+
+set -o pipefail
+set -e
+set -x
+
+ASF_USERNAME=${ASF_USERNAME:?"ASF_USERNAME is required"}
+ASF_PASSWORD=${ASF_PASSWORD:?"ASF_PASSWORD is required"}
+
+PROJECT_DIR="$(cd "$(dirname "$0")"/..; pwd)"
+cd $PROJECT_DIR
+
+upload_nexus_staging() {
+ echo "Deploying rss-client-spark2-shaded"
+ mvn clean install -DskipTests -Papache-release,spark2 \
+ -s "${PROJECT_DIR}/release/asf-settings.xml" \
+ -pl :rss-client-spark2-shaded -Dmaven.javadoc.skip=true -am
+ mvn deploy -DskipTests -Papache-release,spark2 \
+ -s "${PROJECT_DIR}/release/asf-settings.xml" \
+ -pl :rss-client-spark2-shaded -Dmaven.javadoc.skip=true
+
+ echo "Deploying rss-client-spark3-shaded"
+ mvn clean install -DskipTests -Papache-release,spark3 \
+ -s "${PROJECT_DIR}/release/asf-settings.xml" \
+ -pl :rss-client-spark3-shaded -Dmaven.javadoc.skip=true -am
+ mvn deploy -DskipTests -Papache-release,spark3 \
+ -s "${PROJECT_DIR}/release/asf-settings.xml" \
+ -pl :rss-client-spark3-shaded -Dmaven.javadoc.skip=true
+}
+
+upload_nexus_staging
(incubator-uniffle) 02/04: [#1273] feat: add shaded module for spark3 client (#1279)
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xianjingfeng pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
commit 4fde8004faf15c6f0cce07bd10d2b1fad86b0312
Author: xianjingfeng <xi...@gmail.com>
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
(cherry picked from commit 7828558b1952943dd2c55b637463efc9608f24dc)
---
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 | 7 +
6 files changed, 382 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 53e68b165..bfacbdc8d 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 6d2458105..38beb7810 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>
@@ -1317,6 +1318,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>
@@ -1397,6 +1399,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>
@@ -1486,6 +1489,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>
@@ -1576,6 +1580,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>
@@ -1665,6 +1670,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>
@@ -1754,6 +1760,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>
(incubator-uniffle) 01/04: [#1277] chore: add flatten maven plugin (#1278)
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xianjingfeng pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
commit 5b57bf34a6892a060c5df18dd0ce4fcf741d4e32
Author: xianjingfeng <xi...@gmail.com>
AuthorDate: Mon Oct 30 16:19:09 2023 +0800
[#1277] chore: add flatten maven plugin (#1278)
### What changes were proposed in this pull request?
add flatten maven plugin
### Why are the changes needed?
If we add shaded module for clients, we must add flatten-maven-plugin, or the dependences in not-shaded module will not be included in the shaded jar.
Fix: #1277
### Does this PR introduce any user-facing change?
No.
### How was this patch tested?
CI
(cherry picked from commit 2808d25dd0fcbef891d24e06b242b9bd5f04ff47)
---
.gitignore | 1 +
client-mr/core/pom.xml | 5 +++--
client-spark/spark2/pom.xml | 9 +++++----
client-spark/spark3/pom.xml | 5 +++--
client-tez/pom.xml | 8 ++++++++
integration-test/mr/pom.xml | 2 ++
integration-test/spark-common/pom.xml | 4 ++++
integration-test/spark2/pom.xml | 21 +++------------------
integration-test/spark3/pom.xml | 5 +++--
integration-test/tez/pom.xml | 5 +++++
pom.xml | 28 ++++++++++++++++++++++++++++
11 files changed, 65 insertions(+), 28 deletions(-)
diff --git a/.gitignore b/.gitignore
index b6901d7ce..2a1754c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ build/
deploy/kubernetes/integration-test/e2e/rss.yaml
deploy/kubernetes/integration-test/e2e/rss-controller.yaml
deploy/kubernetes/integration-test/e2e/rss-webhook.yaml
+.flattened-pom.xml
diff --git a/client-mr/core/pom.xml b/client-mr/core/pom.xml
index c5a9906d6..223bea2d7 100644
--- a/client-mr/core/pom.xml
+++ b/client-mr/core/pom.xml
@@ -114,6 +114,7 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>hadoop${hadoop.short.version}-shim</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -215,7 +216,7 @@
<configuration>
<target>
<echo message="Shade netty native libraries to ${rss.shade.packageName}" />
- <unzip src="${artifactId}-${version}.jar" dest="${project.build.directory}/unpacked/" />
+ <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>
@@ -236,7 +237,7 @@
type="glob"></mapper>
</move>
<echo message="repackaging netty jar"></echo>
- <jar destfile="${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />
+ <jar destfile="${project.artifactId}-${project.version}.jar" basedir="${project.build.directory}/unpacked" />
</target>
</configuration>
</execution>
diff --git a/client-spark/spark2/pom.xml b/client-spark/spark2/pom.xml
index b24438272..e5ba9d220 100644
--- a/client-spark/spark2/pom.xml
+++ b/client-spark/spark2/pom.xml
@@ -27,9 +27,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark2</artifactId>
- <version>0.8.0</version>
<packaging>jar</packaging>
<name>Apache Uniffle Client (Spark 2)</name>
@@ -41,10 +39,12 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
+ <version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -74,6 +74,7 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -182,7 +183,7 @@
<configuration>
<target>
<echo message="Shade netty native libraries to ${rss.shade.packageName}" />
- <unzip src="${artifactId}-${version}.jar" dest="${project.build.directory}/unpacked/" />
+ <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>
@@ -203,7 +204,7 @@
type="glob"></mapper>
</move>
<echo message="repackaging netty jar"></echo>
- <jar destfile="${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />
+ <jar destfile="${project.artifactId}-${project.version}.jar" basedir="${project.build.directory}/unpacked" />
</target>
</configuration>
</execution>
diff --git a/client-spark/spark3/pom.xml b/client-spark/spark3/pom.xml
index fba4786f3..53e68b165 100644
--- a/client-spark/spark3/pom.xml
+++ b/client-spark/spark3/pom.xml
@@ -27,9 +27,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark3</artifactId>
- <version>0.8.0</version>
<packaging>jar</packaging>
<name>Apache Uniffle Client (Spark 3)</name>
@@ -48,10 +46,12 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -65,6 +65,7 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/client-tez/pom.xml b/client-tez/pom.xml
index d31a8283b..09364005a 100644
--- a/client-tez/pom.xml
+++ b/client-tez/pom.xml
@@ -37,10 +37,12 @@
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-common</artifactId>
+ <version>${tez.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-runtime-library</artifactId>
+ <version>${tez.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -51,14 +53,17 @@
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-runtime-internals</artifactId>
+ <version>${tez.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-dag</artifactId>
+ <version>${tez.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-api</artifactId>
+ <version>${tez.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -83,6 +88,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
</dependency>
<dependency>
@@ -98,6 +104,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -108,6 +115,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
+ <version>${hadoop.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/integration-test/mr/pom.xml b/integration-test/mr/pom.xml
index 431fc82ee..457c67ce1 100644
--- a/integration-test/mr/pom.xml
+++ b/integration-test/mr/pom.xml
@@ -43,6 +43,7 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-common-test</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -106,6 +107,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-examples</artifactId>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
diff --git a/integration-test/spark-common/pom.xml b/integration-test/spark-common/pom.xml
index 53d34e963..385dbee3b 100644
--- a/integration-test/spark-common/pom.xml
+++ b/integration-test/spark-common/pom.xml
@@ -75,23 +75,27 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-common-test</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark${client.type}</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/integration-test/spark2/pom.xml b/integration-test/spark2/pom.xml
index 5db551e32..83d0d5ef4 100644
--- a/integration-test/spark2/pom.xml
+++ b/integration-test/spark2/pom.xml
@@ -27,9 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-spark2-test</artifactId>
- <version>0.8.0</version>
<packaging>jar</packaging>
<name>Apache Uniffle Integration Test (Spark 2)</name>
@@ -38,17 +36,20 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-spark-common-test</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark2</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -91,22 +92,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.binary.version}</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_${scala.binary.version}</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>shuffle-storage</artifactId>
diff --git a/integration-test/spark3/pom.xml b/integration-test/spark3/pom.xml
index b3fcd2991..1a6bf1ef4 100644
--- a/integration-test/spark3/pom.xml
+++ b/integration-test/spark3/pom.xml
@@ -27,9 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-spark3-test</artifactId>
- <version>0.8.0</version>
<packaging>jar</packaging>
<name>Apache Uniffle Integration Test (Spark 3)</name>
@@ -38,17 +36,20 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-spark-common-test</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark3</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark-common</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/integration-test/tez/pom.xml b/integration-test/tez/pom.xml
index 730d022dc..0d6e4fbd8 100644
--- a/integration-test/tez/pom.xml
+++ b/integration-test/tez/pom.xml
@@ -42,6 +42,7 @@
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-integration-common-test</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -64,6 +65,7 @@
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-dag</artifactId>
+ <version>${tez.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -83,6 +85,7 @@
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-tests</artifactId>
+ <version>${tez.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
@@ -119,11 +122,13 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-common</artifactId>
+ <version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<!-- tez-0.9.1 depends on guava 11.0.2, is not compatibility with uniffle and hadoop-3.2.1 (guava-27.0-jre) until
diff --git a/pom.xml b/pom.xml
index c650a2cef..6d2458105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -779,6 +779,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.3.0</version>
+ <configuration>
+ <flattenMode>oss</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <phase>process-resources</phase>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -1061,6 +1085,10 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>