Skip to content

Commit 02ba748

Browse files
authored
HBASE-29008 Upgrade JAX-WS to to 2.3.7 (#6538)
Signed-off-by: Duo Zhang <[email protected]>
1 parent c0904d7 commit 02ba748

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,14 +1492,14 @@ ${dep.scm.url}
14921492
#if(${dep.licenses[0].name.equals("Common Public License Version 1.0")})
14931493
#set($aggregated = $cpl.add($dep))
14941494
#end
1495-
#if( ${dep.licenses[0].name.contains("Eclipse Public License")} )
1495+
#if( ${dep.licenses[0].name.contains("Eclipse Public License")} || ${dep.licenses[0].name.contains("EPL")} )
14961496
#if( ${dep.licenses[0].name.contains("1.0")} )
14971497
#set($aggregated = $epl_1_0.add($dep))
14981498
#elseif( ${dep.licenses[0].name.contains("2.0")} )
14991499
#set($aggregated = $epl_2_0.add($dep))
15001500
#end
15011501
#end
1502-
#if( ${dep.licenses[0].name.contains("Eclipse Distribution License")} )
1502+
#if( ${dep.licenses[0].name.contains("Eclipse Distribution License")} || ${dep.licenses[0].name.contains("EDL")} )
15031503
#if( ${dep.licenses[0].name.contains("1.0")} )
15041504
#set($aggregated = $edl_1_0.add($dep))
15051505
#end

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@
15651565
<dependency>
15661566
<groupId>com.sun.xml.ws</groupId>
15671567
<artifactId>jaxws-rt</artifactId>
1568-
<version>2.3.2</version>
1568+
<version>2.3.7</version>
15691569
<exclusions>
15701570
<exclusion>
15711571
<groupId>javax.activation</groupId>

0 commit comments

Comments
 (0)