From 92ee19764781f956a8986bf189b60820266af38f Mon Sep 17 00:00:00 2001 From: Sakthi Date: Wed, 19 Jun 2019 00:21:08 -0700 Subject: [PATCH] HBASE-22588 Upgrade jaxws-ri dependency to 2.3.2 Signed-off-by: Duo Zhang Signed-off-by: Sean Busbey --- .../src/main/assembly/hadoop-two-compat.xml | 36 +- .../src/main/resources/META-INF/LICENSE.vm | 50 +++ .../main/resources/supplemental-models.xml | 404 +++++------------- pom.xml | 2 +- 4 files changed, 175 insertions(+), 317 deletions(-) diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 794cab57ed3..91d374987a6 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -73,10 +73,12 @@ Java 11 runtime hence excluding from main lib. --> com.sun.xml.ws:* + jakarta.annotation:jakarta.annotation-api org.glassfish.jaxb:* com.sun.istack:istack-commons-runtime - org.glassfish.gmbal:gmbal-api-only + org.glassfish.gmbal:gmbal org.glassfish.external:management-api + org.glassfish.pfl:* org.jvnet.staxex:stax-ex com.sun.xml.stream.buffer:streambuffer org.jvnet.mimepull:mimepull @@ -85,16 +87,16 @@ com.sun.xml.messaging.saaj:saaj-impl com.fasterxml.woodstox:woodstox-core org.codehaus.woodstox:stax2-api + jakarta.activation:jakarta.activation-api com.sun.xml.bind:jaxb-xjc com.sun.xml.bind:jaxb-jxc - javax.mail:mail - javax.persistence:javax.persistence-api + jakarta.mail:jakarta.mail-api + jakarta.persistence:jakarta.persistence-api org.eclipse.persistence:* - org.glassfish:javax.json - commonj.sdo:commonj.sdo - javax.xml.ws:jaxws-api - javax.xml.soap:javax.xml.soap-api - javax.jws:javax.jws-api + jakarta.xml.ws:jakarta.xml.ws-api + jakarta.xml.bind:jakarta.xml.bind-api + jakarta.xml.soap:jakarta.xml.soap-api + jakarta.jws:jakarta.jws-api org.jruby:jruby-complete com.sun.jersey:* @@ -227,10 +229,12 @@ Java 11 runtime --> com.sun.xml.ws:* + jakarta.annotation:jakarta.annotation-api org.glassfish.jaxb:* com.sun.istack:istack-commons-runtime - org.glassfish.gmbal:gmbal-api-only + org.glassfish.gmbal:gmbal org.glassfish.external:management-api + org.glassfish.pfl:* org.jvnet.staxex:stax-ex com.sun.xml.stream.buffer:streambuffer org.jvnet.mimepull:mimepull @@ -239,16 +243,16 @@ com.sun.xml.messaging.saaj:saaj-impl com.fasterxml.woodstox:woodstox-core org.codehaus.woodstox:stax2-api + jakarta.activation:jakarta.activation-api com.sun.xml.bind:jaxb-xjc com.sun.xml.bind:jaxb-jxc - javax.mail:mail - javax.persistence:javax.persistence-api + jakarta.mail:jakarta.mail-api + jakarta.persistence:jakarta.persistence-api org.eclipse.persistence:* - org.glassfish:javax.json - commonj.sdo:commonj.sdo - javax.xml.ws:jaxws-api - javax.xml.soap:javax.xml.soap-api - javax.jws:javax.jws-api + jakarta.xml.ws:jakarta.xml.ws-api + jakarta.xml.bind:jakarta.xml.bind-api + jakarta.xml.soap:jakarta.xml.soap-api + jakarta.jws:jakarta.jws-api 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 a7101fb3282..760208f4b86 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm @@ -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() diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 3cee8007d36..f3a6afcfcc6 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -1927,13 +1927,12 @@ Copyright (c) 2007-2017 The JRuby project - com.sun.xml.bind - jaxb-xjc - 2.3.1 + jakarta.activation + jakarta.activation-api - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1l + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php repo @@ -1941,12 +1940,25 @@ Copyright (c) 2007-2017 The JRuby project - com.sun.xml.bind - jaxb-jxc + jakarta.annotation + jakarta.annotation-api - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 + Eclipse Public License 2.0 + https://www.eclipse.org/legal/epl-v20.html + repo + + + + + + + jakarta.mail + jakarta.mail-api + + + Eclipse Public License 2.0 + https://www.eclipse.org/legal/epl-v20.html repo @@ -1958,8 +1970,8 @@ Copyright (c) 2007-2017 The JRuby project management-api - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php repo @@ -1968,297 +1980,11 @@ Copyright (c) 2007-2017 The JRuby project org.glassfish.gmbal - gmbal-api-only + gmbal - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.messaging.saaj - saaj-impl - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - jaxws-eclipselink-plugin - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - jaxws-ri - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - jaxws-rt - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - jaxws-tools - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - release-documentation - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - samples - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - sdo-eclipselink-plugin - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - com.sun.xml.ws - sdo-eclipselink-plugin - - - CDDL 1.1 - https://oss.oracle.com/licenses/CDDL+GPL-1.1 - repo - - - - - - - javax.jws - javax.jws-api - - - CDDL 1.1 - https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html - repo - - - - - - - javax.mail - mail - - - CDDL 1.1 - http://www.sun.com/cddl - repo - - - - - - - javax.xml.soap - javax.xml.soap-api - - - CDDL 1.1 - https://github.com/javaee/javax.xml.soap/blob/master/LICENSE - repo - - - - - - - javax.xml.ws - jaxws-api - - - CDDL 1.1 - https://github.com/javaee/jax-ws-spec/blob/master/LICENSE.md - repo - - - - - - - org.glassfish.jaxb - jaxb-runtime - - - CDDL 1.1 - http://glassfish.java.net/public/CDDL+GPL_1_1.html - repo - - - - - - - org.glassfish.jaxb - txw2 - - - CDDL 1.1 - http://glassfish.java.net/public/CDDL+GPL_1_1.html - repo - - - - - - - commonj.sdo - commonj.sdo - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html - repo - - - - - - - javax.persistence - javax.persistence-api - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html - repo - - - - - - - org.eclipse.persistence - commonj.sdo - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html - repo - - - - - - - org.eclipse.persistence - org.eclipse.persistence.asm - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html - repo - - - - - - - org.eclipse.persistence - org.eclipse.persistence.core - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html - repo - - - - - - - org.eclipse.persistence - org.eclipse.persistence.moxy - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html - repo - - - - - - - org.eclipse.persistence - org.eclipse.persistence.sdo - - - Eclipse Public License 1.0 - http://www.eclipse.org/legal/epl-v10.html + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php repo @@ -2277,4 +2003,82 @@ Copyright (c) 2007-2017 The JRuby project + + + org.glassfish.pfl + pfl-asm + + + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php + repo + + + + + + + org.glassfish.pfl + pfl-basic + + + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php + repo + + + + + + + org.glassfish.pfl + pfl-basic-tools + + + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php + repo + + + + + + + org.glassfish.pfl + pfl-dynamic + + + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php + repo + + + + + + + org.glassfish.pfl + pfl-tf + + + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php + repo + + + + + + + org.glassfish.pfl + pfl-tf-tools + + + Eclipse Distribution License 1.0 + http://www.eclipse.org/org/documents/edl-v10.php + repo + + + + diff --git a/pom.xml b/pom.xml index 0a7f1f6370a..bdf733fbe2c 100755 --- a/pom.xml +++ b/pom.xml @@ -2238,7 +2238,7 @@ com.sun.xml.ws jaxws-ri - 2.3.1 + 2.3.2 pom