From 51457673b1a001f82b7b90d5845216daf44b8a5f Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Tue, 6 Aug 2024 22:36:10 +0800
Subject: [PATCH] HBASE-28760 Exclude pom file of jaxws-ri in output tarball

---
 .../src/main/assembly/hadoop-three-compat.xml          |  6 +++++-
 hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
index 5bd3b0ba229e..771704d6e1df 100644
--- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
@@ -223,7 +223,7 @@
       <outputDirectory>lib/jdk11</outputDirectory>
       <useTransitiveDependencies>true</useTransitiveDependencies>
       <includes>
-          <include>com.sun.activation:javax.activation</include>
+        <include>com.sun.activation:javax.activation</include>
         <!-- The following artifacts are transitive dependencies of com.sun.xml.ws:jaxws-ri:pom
              They are needed to be included in lib/jdk11 to be added to classpath during
              Java 11 runtime
@@ -254,6 +254,10 @@
         <include>jakarta.xml.soap:jakarta.xml.soap-api</include>
         <include>jakarta.jws:jakarta.jws-api</include>
       </includes>
+      <excludes>
+        <!-- Exclude pom file -->
+        <exclude>com.sun.xml.ws:jaxws-ri:pom</exclude>
+      </excludes>
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib/trace</outputDirectory>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index fffc33a3c41f..1a733c600ba6 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -258,8 +258,12 @@
         <include>org.glassfish.pfl:*</include>
         <include>org.jvnet.mimepull:mimepull</include>
         <include>org.jvnet.staxex:stax-ex</include>
-    </includes>
-  </dependencySet>
-</dependencySets>
+      </includes>
+      <excludes>
+        <!-- Exclude pom file -->
+        <exclude>com.sun.xml.ws:jaxws-ri:pom</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
 
 </assembly>