Skip to content

Commit

Permalink
Improve filter exclusion setting for shade plugin
Browse files Browse the repository at this point in the history 
### What changes are proposed in this pull request?

1. Improve filter setting in `dora/shaded/client/pom.xml` to eliminate some warnings in the shading process.
2. Remove duplicated code of filter setting in UFS. The shading filter in each UFS will inherit the shading plugin settings from `dora/underfs/pom.xml`, enabling us to reduce duplication by moving the common settings to `dora/underfs/pom.xml`.

### Why are the changes needed?

Code hygiene and readability

### Does this PR introduce any user facing changes?

No

			pr-link: #17824
			change-id: cid-1881e1faef2e5b11b5fd63f1c9533985e0bbaaf7
  • Loading branch information
@apc999
apc999 authored Aug 14, 2023
1 parent b80c5ba commit 3d8fbda
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 70 deletions.
4 changes: 4 additions & 0 deletions dora/shaded/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,10 @@
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/LICENSE.*</exclude>
<exclude>META-INF/license/*</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/NOTICE.*</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
Expand Down
12 changes: 1 addition & 11 deletions dora/underfs/abfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,10 @@
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
<exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
</excludes>
</filter>
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
Expand Down
12 changes: 1 addition & 11 deletions dora/underfs/adl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,10 @@
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
<exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
</excludes>
</filter>
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
Expand Down
12 changes: 2 additions & 10 deletions dora/underfs/cephfs-hadoop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,11 @@
<phase>package</phase>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
<exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
Expand Down
12 changes: 1 addition & 11 deletions dora/underfs/cosn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,10 @@
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
<exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
</excludes>
</filter>
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
Expand Down
16 changes: 0 additions & 16 deletions dora/underfs/ozone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,6 @@
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
<filter>
<artifact>commons-httpclient:commons-httpclient</artifact>
<excludes>
<exclude>META-INF/LICENSE.txt</exclude>
</excludes>
</filter>
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
Expand Down
4 changes: 4 additions & 0 deletions dora/underfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/LICENSE.*</exclude>
<exclude>META-INF/license/*</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/NOTICE.*</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
Expand Down
12 changes: 1 addition & 11 deletions dora/underfs/wasb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,10 @@
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>LICENSE</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
<exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
</excludes>
</filter>
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
Expand Down

0 comments on commit 3d8fbda

Please sign in to comment.