This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new d4b46d03d58 HBASE-28760 Exclude pom file of jaxws-ri in output tarball
(#6140)
d4b46d03d58 is described below
commit d4b46d03d58bcd108673f325270157c2e39c7019
Author: Duo Zhang <[email protected]>
AuthorDate: Wed Aug 7 10:17:50 2024 +0800
HBASE-28760 Exclude pom file of jaxws-ri in output tarball (#6140)
Signed-off-by: Nihal Jain <[email protected]>
(cherry picked from commit 34898bf43c7649d32beca2ddc5cd502fc465a683)
---
hbase-assembly/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 5bd3b0ba229..771704d6e1d 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 fffc33a3c41..1a733c600ba 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>
