You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by et...@apache.org on 2023/03/01 08:59:06 UTC
[incubator-celeborn] branch main updated: Revert "[CELEBORN-355][BUILD] Create shaded module for Celeborn common (#1290)" (#1293)
This is an automated email from the ASF dual-hosted git repository.
ethanfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 328a6ff2f Revert "[CELEBORN-355][BUILD] Create shaded module for Celeborn common (#1290)" (#1293)
328a6ff2f is described below
commit 328a6ff2f5298b36aa175ce22619631ee2e508df
Author: Ethan Feng <et...@apache.org>
AuthorDate: Wed Mar 1 16:59:02 2023 +0800
Revert "[CELEBORN-355][BUILD] Create shaded module for Celeborn common (#1290)" (#1293)
This reverts commit 725028a10a6850c97a33fc9912e53aad29fde3f0.
---
common-shade/pom.xml | 126 ---------------------------------------------------
pom.xml | 1 -
2 files changed, 127 deletions(-)
diff --git a/common-shade/pom.xml b/common-shade/pom.xml
deleted file mode 100644
index 9a6bdd2e8..000000000
--- a/common-shade/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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-common-shaded_${scala.binary.version}</artifactId>
- <packaging>jar</packaging>
- <name>Celeborn Shaded Common</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.celeborn</groupId>
- <artifactId>celeborn-common_${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>io.netty</pattern>
- <shadedPattern>${shading.prefix}.io.netty</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons</pattern>
- <shadedPattern>${shading.prefix}.org.apache.commons</shadedPattern>
- </relocation>
- </relocations>
- <artifactSet>
- <includes>
- <include>org.apache.celeborn:*</include>
- <include>com.google.protobuf:protobuf-java</include>
- <include>com.google.guava:guava</include>
- <include>io.netty:*</include>
- <include>org.apache.commons:commons-lang3</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>
- </excludes>
- </filter>
- </filters>
- </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.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>
-</project>
diff --git a/pom.xml b/pom.xml
index eca1036cd..2eee90098 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
<modules>
<module>common</module>
- <module>common-shade</module>
<module>client</module>
<module>service</module>
<module>master</module>