Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-29008 Upgrade JAX-WS to to 2.3.7 and use jaxws-rt instead of ja… #6503

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −6
Open

HBASE-29008 Upgrade JAX-WS to to 2.3.7 and use jaxws-rt instead of ja… #6503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hbase-dev-generate-classpath/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<type>pom</type>
</dependency>
<!--
Include the log framework here.
Expand Down
1 change: 0 additions & 1 deletion hbase-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<type>pom</type>
</dependency>
</dependencies>
</profile>
Expand Down
4 changes: 2 additions & 2 deletions hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down