HIVE-26843: Filter all dependency module descriptors from shaded jars…

… (Chris Nauroth reviewed by Stamatis Zampetakis) Closes apache#3853
tarak271 · Dec 19, 2023 · 5e177e3 · 5e177e3
1 parent 83a0c6d
commit 5e177e3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/beeline/pom.xml b/beeline/pom.xml
@@ -256,21 +256,17 @@
               </transformers>
               <filters>
                 <filter>
-                  <!--
-                  Shading signed JARs will fail without this.
-                  http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
-                  -->
                   <artifact>*:*</artifact>
                   <excludes>
+                    <!--
+                    Shading signed JARs will fail without this.
+                    http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+                    -->
                     <exclude>META-INF/*.SF</exclude>
                     <exclude>META-INF/*.DSA</exclude>
                     <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-                <filter>
-                  <artifact>com.zaxxer:HikariCP</artifact>
-                  <excludes>
-                    <exclude>META-INF/versions/11/module-info.class</exclude>
+                    <!-- Exclude dependency module descriptors, which would be incorrect in a Hive jar. -->
+                    <exclude>META-INF/versions/*/module-info.class</exclude>
                   </excludes>
                 </filter>
               </filters>

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -202,20 +202,21 @@
                     <filter>
                       <artifact>*:*</artifact>
                       <excludes>
+                        <!--
+                        Shading signed JARs will fail without this.
+                        http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+                        -->
                         <exclude>META-INF/*.SF</exclude>
                         <exclude>META-INF/*.DSA</exclude>
                         <exclude>META-INF/*.RSA</exclude>
+                        <!-- Exclude irrelevant webapp files of dependencies. -->
                         <exclude>core-default.xml</exclude>
                         <exclude>webapps/</exclude>
                         <exclude>hive-webapps/</exclude>
                         <exclude>hbase-webapps/</exclude>
                         <exclude>static/</exclude>
-                      </excludes>
-                    </filter>
-                    <filter>
-                      <artifact>com.zaxxer:HikariCP</artifact>
-                      <excludes>
-                        <exclude>META-INF/versions/11/module-info.class</exclude>
+                        <!-- Exclude dependency module descriptors, which would be incorrect in a Hive jar. -->
+                        <exclude>META-INF/versions/*/module-info.class</exclude>
                       </excludes>
                     </filter>
                   </filters>

diff --git a/ql/pom.xml b/ql/pom.xml
@@ -1108,15 +1108,17 @@
                 <filter>
                   <artifact>org.apache.calcite.avatica:avatica</artifact>
                   <excludes>
+                    <!-- Exclude Avatica bundled SLF4J, because Hive manages its own SLF4J version. -->
                     <exclude>org/slf4j/**</exclude>
                     <exclude>META-INF/maven/org.slf4j/**</exclude>
                     <exclude>META-INF/licenses/slf4j*/**</exclude>
                   </excludes>
                 </filter>
                 <filter>
-                  <artifact>com.zaxxer:HikariCP</artifact>
+                  <artifact>*:*</artifact>
                   <excludes>
-                    <exclude>META-INF/versions/11/module-info.class</exclude>
+                    <!-- Exclude dependency module descriptors, which would be incorrect in a Hive jar. -->
+                    <exclude>META-INF/versions/*/module-info.class</exclude>
                   </excludes>
                 </filter>
               </filters>