e85207e2c7
### What changes were proposed in this pull request? This PR partially reverts the change of https://github.com/apache/celeborn/pull/2813, namely, restores the renaming of `celeborn-client-spark-3` ### Why are the changes needed? The renaming is not necessary, and might cause some confusion, for example, I wrongly interpreted the `spark-3-4` as Spark 3.4, it also increases the backport efforts for branch-0.5 ### Does this PR introduce _any_ user-facing change? No, it's dev only, before/after this change, the end users always use the shaded client ``` celeborn-client-spark-2-shaded_2.11-0.6.0-SNAPSHOT.jar celeborn-client-spark-3-shaded_2.12-0.6.0-SNAPSHOT.jar celeborn-client-spark-4-shaded_2.13-0.6.0-SNAPSHOT.jar ``` ### How was this patch tested? Pass GA. Closes #3133 from pan3793/CELEBORN-1413-followup. Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: mingji <fengmingxiao.fmx@alibaba-inc.com>
197 lines
8.5 KiB
XML
197 lines
8.5 KiB
XML
<?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.celeborn</groupId>
|
|
<artifactId>celeborn-parent_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
<relativePath>../../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<artifactId>celeborn-client-spark-3-shaded_${scala.binary.version}</artifactId>
|
|
<packaging>jar</packaging>
|
|
<name>Celeborn Shaded Client for Spark 3</name>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-client-spark-3_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
<configuration>
|
|
<relocations>
|
|
<relocation>
|
|
<pattern>com.google.protobuf</pattern>
|
|
<shadedPattern>${shading.prefix}.com.google.protobuf</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>com.google.common</pattern>
|
|
<shadedPattern>${shading.prefix}.com.google.common</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>com.google.thirdparty</pattern>
|
|
<shadedPattern>${shading.prefix}.com.google.thirdparty</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>io.netty</pattern>
|
|
<shadedPattern>${shading.prefix}.io.netty</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>org.apache.commons</pattern>
|
|
<shadedPattern>${shading.prefix}.org.apache.commons</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>org.roaringbitmap</pattern>
|
|
<shadedPattern>${shading.prefix}.org.roaringbitmap</shadedPattern>
|
|
</relocation>
|
|
</relocations>
|
|
<artifactSet>
|
|
<includes>
|
|
<include>org.apache.celeborn:*</include>
|
|
<include>com.google.protobuf:protobuf-java</include>
|
|
<include>com.google.guava:guava</include>
|
|
<include>com.google.guava:failureaccess</include>
|
|
<include>io.netty:*</include>
|
|
<include>org.apache.commons:commons-lang3</include>
|
|
<include>org.roaringbitmap:RoaringBitmap</include>
|
|
</includes>
|
|
</artifactSet>
|
|
<filters>
|
|
<filter>
|
|
<artifact>*:*</artifact>
|
|
<excludes>
|
|
<exclude>**/*.proto</exclude>
|
|
<exclude>META-INF/*.SF</exclude>
|
|
<exclude>META-INF/*.DSA</exclude>
|
|
<exclude>META-INF/*.RSA</exclude>
|
|
<exclude>**/log4j.properties</exclude>
|
|
<exclude>META-INF/LICENSE.txt</exclude>
|
|
<exclude>META-INF/NOTICE.txt</exclude>
|
|
<exclude>LICENSE.txt</exclude>
|
|
<exclude>NOTICE.txt</exclude>
|
|
</excludes>
|
|
</filter>
|
|
</filters>
|
|
<transformers>
|
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
|
|
</transformers>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-antrun-plugin</artifactId>
|
|
<version>${maven.plugin.antrun.version}</version>
|
|
<executions>
|
|
<execution>
|
|
<id>rename-native-library</id>
|
|
<goals>
|
|
<goal>run</goal>
|
|
</goals>
|
|
<phase>package</phase>
|
|
<configuration>
|
|
<target>
|
|
<echo message="unpacking netty jar"></echo>
|
|
<unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${artifactId}-${version}.jar"></unzip>
|
|
<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="liborg_apache_celeborn_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="liborg_apache_celeborn_shaded_netty_transport_native_epoll_aarch_64.so" type="glob"></mapper>
|
|
</move>
|
|
<echo message="deleting native kqueue library"></echo>
|
|
<delete file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib"></delete>
|
|
<delete file="${project.build.directory}/unpacked/META-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib"></delete>
|
|
<delete file="${project.build.directory}/unpacked/META-INF/native/libnetty_resolver_dns_native_macos_aarch_64.jnilib"></delete>
|
|
<delete file="${project.build.directory}/unpacked/META-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib"></delete>
|
|
<echo message="deleting META-INF/native-image folder"></echo>
|
|
<delete dir="${project.build.directory}/unpacked/META-INF/native-image"></delete>
|
|
<echo message="repackaging netty jar"></echo>
|
|
<jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${artifactId}-${version}.jar"></jar>
|
|
</target>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>spark-3.0</id>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-spark-3-columnar-shuffle_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
<profile>
|
|
<id>spark-3.1</id>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-spark-3-columnar-shuffle_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
<profile>
|
|
<id>spark-3.2</id>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-spark-3-columnar-shuffle_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
<profile>
|
|
<id>spark-3.3</id>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-spark-3-columnar-shuffle_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
<profile>
|
|
<id>spark-3.4</id>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-spark-3-columnar-shuffle_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
</dependency>
|
|
</dependencies>
|
|
</profile>
|
|
</profiles>
|
|
</project>
|