Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22588 Upgrade jaxws-ri dependency to 2.3.2 

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
(cherry picked from commit 92ee197647)
This commit is contained in:
Sakthi 2019-06-19 00:21:08 -07:00 committed by Sean Busbey
parent 5a9b9c070f
commit c248e12bc4
4 changed files with 175 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hbase-assembly/src/main/assembly/hadoop-two-compat.xml
View File

@ -71,10 +71,12 @@
Java 11 runtime hence excluding from main lib.
-->
<exclude>com.sun.xml.ws:*</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>org.glassfish.jaxb:*</exclude>
<exclude>com.sun.istack:istack-commons-runtime</exclude>
<exclude>org.glassfish.gmbal:gmbal-api-only</exclude>
<exclude>org.glassfish.gmbal:gmbal</exclude>
<exclude>org.glassfish.external:management-api</exclude>
<exclude>org.glassfish.pfl:*</exclude>
<exclude>org.jvnet.staxex:stax-ex</exclude>
<exclude>com.sun.xml.stream.buffer:streambuffer</exclude>
<exclude>org.jvnet.mimepull:mimepull</exclude>
@ -83,16 +85,16 @@
<exclude>com.sun.xml.messaging.saaj:saaj-impl</exclude>
<exclude>com.fasterxml.woodstox:woodstox-core</exclude>
<exclude>org.codehaus.woodstox:stax2-api</exclude>
<exclude>jakarta.activation:jakarta.activation-api</exclude>
<exclude>com.sun.xml.bind:jaxb-xjc</exclude>
<exclude>com.sun.xml.bind:jaxb-jxc</exclude>
<exclude>javax.mail:mail</exclude>
<exclude>javax.persistence:javax.persistence-api</exclude>
<exclude>jakarta.mail:jakarta.mail-api</exclude>
<exclude>jakarta.persistence:jakarta.persistence-api</exclude>
<exclude>org.eclipse.persistence:*</exclude>
<exclude>org.glassfish:javax.json</exclude>
<exclude>commonj.sdo:commonj.sdo</exclude>
<exclude>javax.xml.ws:jaxws-api</exclude>
<exclude>javax.xml.soap:javax.xml.soap-api</exclude>
<exclude>javax.jws:javax.jws-api</exclude>
<exclude>jakarta.xml.ws:jakarta.xml.ws-api</exclude>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
<exclude>jakarta.xml.soap:jakarta.xml.soap-api</exclude>
<exclude>jakarta.jws:jakarta.jws-api</exclude>
<!-- Exclude libraries that we put in their own dirs under lib/ -->
<exclude>org.jruby:jruby-complete</exclude>
<exclude>com.sun.jersey:*</exclude>
@ -225,10 +227,12 @@
Java 11 runtime
-->
<include>com.sun.xml.ws:*</include>
<include>jakarta.annotation:jakarta.annotation-api</include>
<include>org.glassfish.jaxb:*</include>
<include>com.sun.istack:istack-commons-runtime</include>
<include>org.glassfish.gmbal:gmbal-api-only</include>
<include>org.glassfish.gmbal:gmbal</include>
<include>org.glassfish.external:management-api</include>
<include>org.glassfish.pfl:*</include>
<include>org.jvnet.staxex:stax-ex</include>
<include>com.sun.xml.stream.buffer:streambuffer</include>
<include>org.jvnet.mimepull:mimepull</include>
@ -237,16 +241,16 @@
<include>com.sun.xml.messaging.saaj:saaj-impl</include>
<include>com.fasterxml.woodstox:woodstox-core</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>jakarta.activation:jakarta.activation-api</include>
<include>com.sun.xml.bind:jaxb-xjc</include>
<include>com.sun.xml.bind:jaxb-jxc</include>
<include>javax.mail:mail</include>
<include>javax.persistence:javax.persistence-api</include>
<include>jakarta.mail:jakarta.mail-api</include>
<include>jakarta.persistence:jakarta.persistence-api</include>
<include>org.eclipse.persistence:*</include>
<include>org.glassfish:javax.json</include>
<include>commonj.sdo:commonj.sdo</include>
<include>javax.xml.ws:jaxws-api</include>
<include>javax.xml.soap:javax.xml.soap-api</include>
<include>javax.jws:javax.jws-api</include>
<include>jakarta.xml.ws:jakarta.xml.ws-api</include>
<include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>jakarta.xml.soap:jakarta.xml.soap-api</include>
<include>jakarta.jws:jakarta.jws-api</include>
</includes>
</dependencySet>
</dependencySets>

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

@ -1328,6 +1328,8 @@ You can redistribute it and/or modify it under either the terms of the
## gather up EPL licensed works
#set($epl_1_0 = [])
#set($epl_2_0 = [])
## gather up EDL works
#set($edl_1_0 = [])
## track commons-math
#set($commons-math = false)
## track if we need jruby additionals.
@ -1449,6 +1451,11 @@ ${dep.scm.url}
#set($aggregated = $epl_2_0.add($dep))
#end
#end
#if( ${dep.licenses[0].name.contains("Eclipse Distribution License")} )
#if( ${dep.licenses[0].name.contains("1.0")} )
#set($aggregated = $edl_1_0.add($dep))
#end
#end
#if(!${aggregated})
--
This product includes ${dep.name} licensed under the ${dep.licenses[0].name}.
@ -2859,6 +2866,49 @@ This product includes the following works licensed under the Eclipse Public Lice
You may add additional accurate notices of copyright ownership.
#end
#if(!(${edl_1_0.isEmpty()}))
====
## print all the EDL 1.0 licensed works
This product includes the following works licensed under the Eclipse Distribution License 1.0:
#foreach($dep in $edl_1_0)
#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
* ${dep.name}, ${dep.licenses[0].comments}
#else
* ${dep.name}
#end
#end
Eclipse Distribution License - v 1.0
Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other materials provided
with the distribution.
3. Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be
used to endorse or promote products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#end
## We put the JRuby incorporated works bits here, since we first reference JRuby in the EPL section.
#if($jruby)
#jruby_license()

404
hbase-resource-bundle/src/main/resources/supplemental-models.xml
View File

@ -3013,13 +3013,12 @@ Copyright (c) 2007-2017 The JRuby project
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.3.1</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1l</url>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
@ -3027,12 +3026,25 @@ Copyright (c) 2007-2017 The JRuby project
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-jxc</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<name>Eclipse Public License 2.0</name>
<url>https://www.eclipse.org/legal/epl-v20.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<licenses>
<license>
<name>Eclipse Public License 2.0</name>
<url>https://www.eclipse.org/legal/epl-v20.html</url>
<distribution>repo</distribution>
</license>
</licenses>
@ -3044,8 +3056,8 @@ Copyright (c) 2007-2017 The JRuby project
<artifactId>management-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
@ -3054,297 +3066,11 @@ Copyright (c) 2007-2017 The JRuby project
<supplement>
<project>
<groupId>org.glassfish.gmbal</groupId>
<artifactId>gmbal-api-only</artifactId>
<artifactId>gmbal</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-eclipselink-plugin</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-tools</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>release-documentation</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>samples</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>sdo-eclipselink-plugin</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>com.sun.xml.ws</groupId>
<artifactId>sdo-eclipselink-plugin</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>http://www.sun.com/cddl</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://github.com/javaee/javax.xml.soap/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>https://github.com/javaee/jax-ws-spec/blob/master/LICENSE.md</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>http://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<licenses>
<license>
<name>CDDL 1.1</name>
<url>http://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>commonj.sdo</groupId>
<artifactId>commonj.sdo</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.eclipse.persistence</groupId>
<artifactId>commonj.sdo</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.asm</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.sdo</artifactId>
<licenses>
<license>
<name>Eclipse Public License 1.0</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
@ -3363,4 +3089,82 @@ Copyright (c) 2007-2017 The JRuby project
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-asm</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic-tools</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-dynamic</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-tf</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
<supplement>
<project>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-tf-tools</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License 1.0</name>
<url>http://www.eclipse.org/org/documents/edl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
</project>
</supplement>
</supplementalDataModels>

2
pom.xml
View File

@ -2084,7 +2084,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
<type>pom</type>
<exclusions>
<exclusion>