This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new e690aa78136 HBASE-29008 Upgrade JAX-WS to to 2.3.7 (#6503)
e690aa78136 is described below
commit e690aa781369867840528af2e5cfbbd4be29d05b
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Jan 9 13:12:35 2025 +0100
HBASE-29008 Upgrade JAX-WS to to 2.3.7 (#6503)
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 04cd9ded6556760ee40885e23db1f42f8e6699d7)
---
hbase-dev-generate-classpath/pom.xml | 1 -
hbase-it/pom.xml | 1 -
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 4 ++--
pom.xml | 3 +--
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/hbase-dev-generate-classpath/pom.xml
b/hbase-dev-generate-classpath/pom.xml
index e09ee1cd6f1..1906381a4ee 100644
--- a/hbase-dev-generate-classpath/pom.xml
+++ b/hbase-dev-generate-classpath/pom.xml
@@ -196,7 +196,6 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <type>pom</type>
</dependency>
<!--
Include the log framework here.
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 98cf8973cd7..c3fe14c07b1 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -347,7 +347,6 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <type>pom</type>
</dependency>
</dependencies>
</profile>
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index 2069632708c..15bdb160560 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1492,14 +1492,14 @@ ${dep.scm.url}
#if(${dep.licenses[0].name.equals("Common Public License Version 1.0")})
#set($aggregated = $cpl.add($dep))
#end
-#if( ${dep.licenses[0].name.contains("Eclipse Public License")} )
+#if( ${dep.licenses[0].name.contains("Eclipse Public License")} ||
${dep.licenses[0].name.contains("EPL")} )
#if( ${dep.licenses[0].name.contains("1.0")} )
#set($aggregated = $epl_1_0.add($dep))
#elseif( ${dep.licenses[0].name.contains("2.0")} )
#set($aggregated = $epl_2_0.add($dep))
#end
#end
-#if( ${dep.licenses[0].name.contains("Eclipse Distribution License")} )
+#if( ${dep.licenses[0].name.contains("Eclipse Distribution License")} ||
${dep.licenses[0].name.contains("EDL")} )
#if( ${dep.licenses[0].name.contains("1.0")} )
#set($aggregated = $edl_1_0.add($dep))
#end
diff --git a/pom.xml b/pom.xml
index 5212907a76d..b5df6a8ae84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1803,8 +1803,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.3.2</version>
- <type>pom</type>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
