From 7c0e0bf66b688f61e8c4dc16ec336203d5d37c14 Mon Sep 17 00:00:00 2001
From: Bin Fan <fanbin103@gmail.com>
Date: Sun, 23 Jul 2023 00:16:49 -0700
Subject: [PATCH] Improve pom for shade plugin

---
 dora/shaded/client/pom.xml         |  4 ++
 dora/underfs/abfs/pom.xml          | 12 +-----
 dora/underfs/adl/pom.xml           | 12 +-----
 dora/underfs/cephfs-hadoop/pom.xml | 11 +-----
 dora/underfs/cosn/pom.xml          | 60 +++++++++++++-----------------
 dora/underfs/ozone/pom.xml         | 16 --------
 dora/underfs/pom.xml               |  4 ++
 dora/underfs/wasb/pom.xml          | 12 +-----
 8 files changed, 37 insertions(+), 94 deletions(-)

diff --git a/dora/shaded/client/pom.xml b/dora/shaded/client/pom.xml
index 30cdb90fdf0b..57beec8858a1 100644
--- a/dora/shaded/client/pom.xml
+++ b/dora/shaded/client/pom.xml
@@ -201,6 +201,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>
diff --git a/dora/underfs/abfs/pom.xml b/dora/underfs/abfs/pom.xml
index 84a4e8b2fd2f..625f06526b56 100644
--- a/dora/underfs/abfs/pom.xml
+++ b/dora/underfs/abfs/pom.xml
@@ -74,20 +74,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>
diff --git a/dora/underfs/adl/pom.xml b/dora/underfs/adl/pom.xml
index 47c56ccc4f32..3638f48a6012 100755
--- a/dora/underfs/adl/pom.xml
+++ b/dora/underfs/adl/pom.xml
@@ -81,20 +81,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>
diff --git a/dora/underfs/cephfs-hadoop/pom.xml b/dora/underfs/cephfs-hadoop/pom.xml
index dabbdccab753..89d409a60c47 100644
--- a/dora/underfs/cephfs-hadoop/pom.xml
+++ b/dora/underfs/cephfs-hadoop/pom.xml
@@ -60,19 +60,10 @@
             </goals>
             <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>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
                   </excludes>
                 </filter>
diff --git a/dora/underfs/cosn/pom.xml b/dora/underfs/cosn/pom.xml
index 96290992346a..248f9d5311ba 100644
--- a/dora/underfs/cosn/pom.xml
+++ b/dora/underfs/cosn/pom.xml
@@ -65,41 +65,31 @@
 
   <build>
     <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>shade</id>
-              <phase>package</phase>
-              <goals>
-                <goal>shade</goal>
-              </goals>
-              <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>
-                      <!-- 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>
-                </filters>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>shade</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <filters>
+                <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>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>exec-maven-plugin</artifactId>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/dora/underfs/ozone/pom.xml b/dora/underfs/ozone/pom.xml
index aac6b572009d..8babf6aae22e 100644
--- a/dora/underfs/ozone/pom.xml
+++ b/dora/underfs/ozone/pom.xml
@@ -144,22 +144,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>
diff --git a/dora/underfs/pom.xml b/dora/underfs/pom.xml
index 8bbf99b4db57..f3f21fb621af 100755
--- a/dora/underfs/pom.xml
+++ b/dora/underfs/pom.xml
@@ -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>
diff --git a/dora/underfs/wasb/pom.xml b/dora/underfs/wasb/pom.xml
index 315ebf76820b..7676aeebcdc2 100644
--- a/dora/underfs/wasb/pom.xml
+++ b/dora/underfs/wasb/pom.xml
@@ -81,20 +81,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>