Skip to content

Commit

Permalink
Revert "[apache#1735] fix(client): Shade spark client grpc/jetty and …
Browse files Browse the repository at this point in the history 
…others dependencies (apache#1878)"

This reverts commit 41e1736.
  • Loading branch information
@zhengchenyu
zhengchenyu committed Aug 9, 2024
1 parent 9def891 commit 25709d8
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 228 deletions.
136 changes: 22 additions & 114 deletions client-spark/spark2-shaded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,45 +35,7 @@
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark2</artifactId>
<version>${project.version}</version>
<!-- use the lz4 from spark env -->
<exclusions>
<exclusion>
<artifactId>lz4</artifactId>
<groupId>net.jpountz.lz4</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- log4j2 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Use log4j-slf4j-impl by default -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- end -->
</dependencies>

<build>
Expand All @@ -91,7 +53,22 @@
<configuration>
<artifactSet>
<includes>
<include>*:*</include>
<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:*</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>
<include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<finalName>${project.artifactId}-${project.version}</finalName>
Expand All @@ -111,14 +88,17 @@
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>**/*.proto</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>${rss.shade.packageName}.com.google</shadedPattern>
<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>
Expand All @@ -140,82 +120,10 @@
<pattern>io.netty</pattern>
<shadedPattern>${rss.shade.packageName}.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>${rss.shade.packageName}.io.grpc</shadedPattern>
</relocation>
<relocation>
<pattern>io.perfmark</pattern>
<shadedPattern>${rss.shade.packageName}.io.perfmark</shadedPattern>
</relocation>
<relocation>
<pattern>org.roaringbitmap</pattern>
<shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>${rss.shade.packageName}.org.apache</shadedPattern>
<excludes>
<!-- Exclude the packages belonging to uniffle -->
<exclude>org/apache/uniffle/**/*</exclude>
<exclude>org/apache/hadoop/*</exclude>
<exclude>org/apache/hadoop/**/*</exclude>
<!-- Exclude the logging packages-->
<exclude>**/pom.xml</exclude>
<exclude>org/apache/commons/logging/*</exclude>
<exclude>org/apache/commons/logging/**/*</exclude>
<exclude>org/apache/log4j/*</exclude>
<exclude>org/apache/log4j/**/*</exclude>
<!-- Exclude spark packages -->
<exclude>org/apache/spark/**/*</exclude>
<!-- Exclude commons-io packages -->
<exclude>org/apache/commons/io/**/*</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.codehaus</pattern>
<shadedPattern>${rss.shade.packageName}.codehaus</shadedPattern>
</relocation>
<relocation>
<pattern>android.annotation</pattern>
<shadedPattern>${rss.shade.packageName}.android.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>javax</pattern>
<shadedPattern>${rss.shade.packageName}.javax</shadedPattern>
<includes>
<include>javax/annotation/**/*</include>
<include>javax/activation/**/*</include>
<include>javax/xml/**/*</include>
<include>javax/inject/**/*</include>
<include>javax/validation/**/*</include>
<include>javax/servlet/**/*</include>
</includes>
</relocation>
<relocation>
<pattern>javassist</pattern>
<shadedPattern>${rss.shade.packageName}.javassist</shadedPattern>
</relocation>
<relocation>
<pattern>io.prometheus.client</pattern>
<shadedPattern>${rss.shade.packageName}.io.prometheus.client</shadedPattern>
</relocation>
<relocation>
<pattern>com.sun.activation</pattern>
<shadedPattern>${rss.shade.packageName}.com.sun.activation</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>${rss.shade.packageName}.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse</pattern>
<shadedPattern>${rss.shade.packageName}.org.eclipse</shadedPattern>
</relocation>
<relocation>
<pattern>picocli</pattern>
<shadedPattern>${rss.shade.packageName}.picocli</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down
136 changes: 22 additions & 114 deletions client-spark/spark3-shaded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,45 +35,7 @@
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-client-spark3</artifactId>
<version>${project.version}</version>
<!-- use the lz4 from spark env -->
<exclusions>
<exclusion>
<artifactId>lz4</artifactId>
<groupId>net.jpountz.lz4</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- log4j2 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Use log4j-slf4j-impl by default -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- end -->
</dependencies>

<build>
Expand All @@ -91,7 +53,22 @@
<configuration>
<artifactSet>
<includes>
<include>*:*</include>
<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:*</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>
<include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<finalName>${project.artifactId}-${project.version}</finalName>
Expand All @@ -111,14 +88,17 @@
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>**/*.proto</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>${rss.shade.packageName}.com.google</shadedPattern>
<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>
Expand All @@ -140,82 +120,10 @@
<pattern>io.netty</pattern>
<shadedPattern>${rss.shade.packageName}.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>${rss.shade.packageName}.io.grpc</shadedPattern>
</relocation>
<relocation>
<pattern>io.perfmark</pattern>
<shadedPattern>${rss.shade.packageName}.io.perfmark</shadedPattern>
</relocation>
<relocation>
<pattern>org.roaringbitmap</pattern>
<shadedPattern>${rss.shade.packageName}.org.roaringbitmap</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>${rss.shade.packageName}.org.apache</shadedPattern>
<excludes>
<!-- Exclude the packages belonging to uniffle -->
<exclude>org/apache/uniffle/**/*</exclude>
<exclude>org/apache/hadoop/*</exclude>
<exclude>org/apache/hadoop/**/*</exclude>
<!-- Exclude the logging packages-->
<exclude>**/pom.xml</exclude>
<exclude>org/apache/commons/logging/*</exclude>
<exclude>org/apache/commons/logging/**/*</exclude>
<exclude>org/apache/log4j/*</exclude>
<exclude>org/apache/log4j/**/*</exclude>
<!-- Exclude spark packages -->
<exclude>org/apache/spark/**/*</exclude>
<!-- Exclude commons-io packages -->
<exclude>org/apache/commons/io/**/*</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.codehaus</pattern>
<shadedPattern>${rss.shade.packageName}.codehaus</shadedPattern>
</relocation>
<relocation>
<pattern>android.annotation</pattern>
<shadedPattern>${rss.shade.packageName}.android.annotation</shadedPattern>
</relocation>
<relocation>
<pattern>javax</pattern>
<shadedPattern>${rss.shade.packageName}.javax</shadedPattern>
<includes>
<include>javax/annotation/**/*</include>
<include>javax/activation/**/*</include>
<include>javax/xml/**/*</include>
<include>javax/inject/**/*</include>
<include>javax/validation/**/*</include>
<include>javax/servlet/**/*</include>
</includes>
</relocation>
<relocation>
<pattern>javassist</pattern>
<shadedPattern>${rss.shade.packageName}.javassist</shadedPattern>
</relocation>
<relocation>
<pattern>io.prometheus.client</pattern>
<shadedPattern>${rss.shade.packageName}.io.prometheus.client</shadedPattern>
</relocation>
<relocation>
<pattern>com.sun.activation</pattern>
<shadedPattern>${rss.shade.packageName}.com.sun.activation</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>${rss.shade.packageName}.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>org.eclipse</pattern>
<shadedPattern>${rss.shade.packageName}.org.eclipse</shadedPattern>
</relocation>
<relocation>
<pattern>picocli</pattern>
<shadedPattern>${rss.shade.packageName}.picocli</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down

0 comments on commit 25709d8

Please sign in to comment.