From bcbb5d7ac221bfdf27ccbfa8bfa38d3f2c896e3e Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Mon, 2 Dec 2024 08:46:28 +0100
Subject: [PATCH] HBASE-29008 Upgrade JAX-WS to to 2.3.7

---
 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 e09ee1cd6f10..1906381a4ee5 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 98cf8973cd77..c3fe14c07b10 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 2069632708cd..15bdb160560b 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 539473cdc7ce..d889f44c69fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1827,8 +1827,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>