Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
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