From 8262554904cfc8883acdc79952ea6dd3374dc633 Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Mon, 2 Dec 2024 08:46:28 +0100 Subject: [PATCH] HBASE-29008 Upgrade JAX-WS to to 2.3.7 --- hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 5ee6fa16b2ac..ddf51a6e8c66 100644 --- a/pom.xml +++ b/pom.xml @@ -1565,7 +1565,7 @@ com.sun.xml.ws jaxws-rt - 2.3.2 + 2.3.7 javax.activation