This is an automated email from the ASF dual-hosted git repository.
stoty 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 454cd6b288d HBASE-29009 Depend on jaxws-rt instead jaxws-ri (#6528)
454cd6b288d is described below
commit 454cd6b288d60f0399ec1880ab8acc92c080c5a2
Author: Istvan Toth <[email protected]>
AuthorDate: Fri Dec 13 14:01:27 2024 +0100
HBASE-29009 Depend on jaxws-rt instead jaxws-ri (#6528)
Signed-off-by: Nihal Jain <[email protected]>
Reviewed-by: Aman Poonia <[email protected]>
---
hbase-assembly/pom.xml | 3 +--
hbase-assembly/src/main/assembly/hadoop-three-compat.xml | 14 ++------------
hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 16 +++-------------
hbase-it/pom.xml | 3 +--
pom.xml | 3 +--
5 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 1564851b851..459d3d2cb92 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -198,8 +198,7 @@
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
- <type>pom</type>
+ <artifactId>jaxws-rt</artifactId>
</dependency>
<!--
Include the log framework here.
diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
index b25fc31c5e6..f536adfdc1b 100644
--- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
@@ -85,11 +85,6 @@
<exclude>org.glassfish.ha:ha-api</exclude>
<exclude>com.sun.xml.messaging.saaj:saaj-impl</exclude>
<exclude>jakarta.activation:jakarta.activation-api</exclude>
- <exclude>com.sun.xml.bind:jaxb-xjc</exclude>
- <exclude>com.sun.xml.bind:jaxb-jxc</exclude>
- <exclude>jakarta.mail:jakarta.mail-api</exclude>
- <exclude>jakarta.persistence:jakarta.persistence-api</exclude>
- <exclude>org.eclipse.persistence:*</exclude>
<exclude>jakarta.xml.ws:jakarta.xml.ws-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>jakarta.xml.soap:jakarta.xml.soap-api</exclude>
@@ -229,7 +224,7 @@
<useTransitiveDependencies>true</useTransitiveDependencies>
<includes>
<include>com.sun.activation:javax.activation</include>
- <!-- The following artifacts are transitive dependencies of
com.sun.xml.ws:jaxws-ri:pom
+ <!-- The following artifacts are transitive dependencies of
com.sun.xml.ws:jaxws-rt:pom
They are needed to be included in lib/jdk11 to be added to
classpath during
Java 11 runtime
-->
@@ -249,11 +244,6 @@
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>jakarta.activation:jakarta.activation-api</include>
- <include>com.sun.xml.bind:jaxb-xjc</include>
- <include>com.sun.xml.bind:jaxb-jxc</include>
- <include>jakarta.mail:jakarta.mail-api</include>
- <include>jakarta.persistence:jakarta.persistence-api</include>
- <include>org.eclipse.persistence:*</include>
<include>jakarta.xml.ws:jakarta.xml.ws-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>jakarta.xml.soap:jakarta.xml.soap-api</include>
@@ -261,7 +251,7 @@
</includes>
<excludes>
<!-- Exclude pom file -->
- <exclude>com.sun.xml.ws:jaxws-ri:pom</exclude>
+ <exclude>com.sun.xml.ws:jaxws-rt:pom</exclude>
</excludes>
</dependencySet>
<dependencySet>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index f79279d0a46..f124ce5dc83 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -70,13 +70,11 @@
<!-- Exclude J2EE libraries that get pulled in when building on
JDK11 -->
<exclude>com.sun.activation:javax.activation</exclude>
<!--
- The following artifacts are transitive dependencies of
com.sun.xml.ws:jaxws-ri:pom
+ The following artifacts are transitive dependencies of
com.sun.xml.ws:jaxws-rt:pom
They are needed to be included in lib/jdk11 to be added to
classpath during
Java 11 runtime hence excluding from main lib.
-->
<exclude>com.sun.istack:istack-commons-runtime</exclude>
- <exclude>com.sun.xml.bind:jaxb-jxc</exclude>
- <exclude>com.sun.xml.bind:jaxb-xjc</exclude>
<exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
<exclude>com.sun.xml.messaging.saaj:saaj-impl</exclude>
<exclude>com.sun.xml.stream.buffer:streambuffer</exclude>
@@ -84,12 +82,9 @@
<exclude>jakarta.activation:jakarta.activation-api</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>jakarta.jws:jakarta.jws-api</exclude>
- <exclude>jakarta.mail:jakarta.mail-api</exclude>
- <exclude>jakarta.persistence:jakarta.persistence-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>jakarta.xml.soap:jakarta.xml.soap-api</exclude>
<exclude>jakarta.xml.ws:jakarta.xml.ws-api</exclude>
- <exclude>org.eclipse.persistence:*</exclude>
<exclude>org.glassfish.external:management-api</exclude>
<exclude>org.glassfish.gmbal:gmbal</exclude>
<exclude>org.glassfish.ha:ha-api</exclude>
@@ -236,13 +231,11 @@
<includes>
<include>com.sun.activation:javax.activation</include>
<!--
- The following artifacts are transitive dependencies of
com.sun.xml.ws:jaxws-ri:pom
+ The following artifacts are transitive dependencies of
com.sun.xml.ws:jaxws-rt:pom
They are needed to be included in lib/jdk11 to be added to classpath
during
Java 11 runtime
-->
<include>com.sun.istack:istack-commons-runtime</include>
- <include>com.sun.xml.bind:jaxb-jxc</include>
- <include>com.sun.xml.bind:jaxb-xjc</include>
<include>com.sun.xml.fastinfoset:FastInfoset</include>
<include>com.sun.xml.messaging.saaj:saaj-impl</include>
<include>com.sun.xml.stream.buffer:streambuffer</include>
@@ -250,12 +243,9 @@
<include>jakarta.activation:jakarta.activation-api</include>
<include>jakarta.annotation:jakarta.annotation-api</include>
<include>jakarta.jws:jakarta.jws-api</include>
- <include>jakarta.mail:jakarta.mail-api</include>
- <include>jakarta.persistence:jakarta.persistence-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>jakarta.xml.soap:jakarta.xml.soap-api</include>
<include>jakarta.xml.ws:jakarta.xml.ws-api</include>
- <include>org.eclipse.persistence:*</include>
<include>org.glassfish.external:management-api</include>
<include>org.glassfish.gmbal:gmbal</include>
<include>org.glassfish.ha:ha-api</include>
@@ -266,7 +256,7 @@
</includes>
<excludes>
<!-- Exclude pom file -->
- <exclude>com.sun.xml.ws:jaxws-ri:pom</exclude>
+ <exclude>com.sun.xml.ws:jaxws-rt:pom</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index aba4efc7b81..72b7bb44a8d 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -350,8 +350,7 @@
<dependencies>
<dependency>
<groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
- <type>pom</type>
+ <artifactId>jaxws-rt</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/pom.xml b/pom.xml
index f79b06d7601..79d06a88992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1564,9 +1564,8 @@
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
+ <artifactId>jaxws-rt</artifactId>
<version>2.3.2</version>
- <type>pom</type>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
