Mercurial > hg > icedtea8-forest > jaxws
changeset 1535:184d3d9543ef icedtea-3.7.0pre01
Merge jdk8u152-b16
| author | andrew |
|---|---|
| date | Thu, 07 Dec 2017 02:46:50 +0000 |
| parents | 77e08d2f7079 (current diff) 04128156e506 (diff) |
| children | 588793656d7c |
| files | .hgtags |
| diffstat | 2 files changed, 39 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Nov 02 06:16:08 2017 +0000 +++ b/.hgtags Thu Dec 07 02:46:50 2017 +0000 @@ -752,3 +752,30 @@ f910c0bf9da82c7b1f10903f2e76eeee0a2e20be jdk8u151-b10 3d15802f4ed80eb489bf0b25bff552bcf831276e jdk8u151-b11 eafb356c44d000be9dba0c8d546b569605d0ccfe icedtea-3.6.0 +cce697096465ebb06fc18835c355ba3ae265042b jdk8u151-b12 +ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00 +2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01 +b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02 +30b5b545a78c0c4fee837664f9c70ef6a2b4f0c1 jdk8u122-b03 +30b5b545a78c0c4fee837664f9c70ef6a2b4f0c1 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +0000000000000000000000000000000000000000 jdk8u122-b03 +a127c3268266ba1402343d94c7b19355c2dd1bd7 jdk8u122-b03 +c48501ec74b9b03870b473e5bde656fce230fc36 jdk8u122-b04 +f3b3163dda3c6da9339dba99a2ee74645ad2edc6 jdk8u132-b00 +55cb39946f2f163085ca80413b8cd3b3e196e533 jdk8u152-b00 +cf960a33b0e3093abcb48bfe304d471e3b092dc4 jdk8u152-b01 +0b4a7ce47e597b8d33e590857384a478c69a9e6f jdk8u152-b02 +98c698b1b09b6a31d5090a25aff8b7a6edb8d6ba jdk8u152-b03 +bcf7fc55388e4c9d771cd2ad38351a66bfcf27d9 jdk8u152-b04 +388cd26b19dbf7d3102653dd82c27027cd722066 jdk8u152-b05 +199a8d03dde0da505f04c87ff72aabdd7022eec5 jdk8u152-b06 +488a01f4ba30dc2eb7205a2800a37ade74cc3ad1 jdk8u152-b07 +86c8e64c0df3e7f18cc98e820b08dde3b67ffabb jdk8u152-b08 +bedae7043858b1e2cdef09d5dd68f4585320b5df jdk8u152-b09 +e2061fccf2caaab7c4dea3fb5b0a34d883821ce4 jdk8u152-b10 +4dc85ca7179702344f298f33c8373ee335dea82c jdk8u152-b11 +e14e868648cdc00abd3aa40aeee2c14afcfe0cd3 jdk8u152-b12 +62481eff71d45189ed8138ee00fa51b10671f2cf jdk8u152-b13 +ef939329cecb82b62d75d76debc5d67246333edd jdk8u152-b14 +199f7d9827f96ee2393f947405473b68372c0757 jdk8u152-b15
--- a/ASSEMBLY_EXCEPTION Thu Nov 02 06:16:08 2017 +0000 +++ b/ASSEMBLY_EXCEPTION Thu Dec 07 02:46:50 2017 +0000 @@ -1,27 +1,27 @@ OPENJDK ASSEMBLY EXCEPTION -The OpenJDK source code made available by Sun at openjdk.java.net and -openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the -GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 +The OpenJDK source code made available by Oracle America, Inc. (Oracle) at +openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU +General Public License <http://www.gnu.org/copyleft/gpl.html> version 2 only ("GPL2"), with the following clarification and special exception. Linking this OpenJDK Code statically or dynamically with other code is making a combined work based on this library. Thus, the terms and conditions of GPL2 cover the whole combination. - As a special exception, Sun gives you permission to link this - OpenJDK Code with certain code licensed by Sun as indicated at + As a special exception, Oracle gives you permission to link this + OpenJDK Code with certain code licensed by Oracle as indicated at http://openjdk.java.net/legal/exception-modules-2007-05-08.html ("Designated Exception Modules") to produce an executable, regardless of the license terms of the Designated Exception Modules, and to copy and distribute the resulting executable under GPL2, provided that the Designated Exception Modules continue to be - governed by the licenses under which they were offered by Sun. + governed by the licenses under which they were offered by Oracle. -As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to -build an executable that includes those portions of necessary code that Sun -could not provide under GPL2 (or that Sun has provided under GPL2 with the -Classpath exception). If you modify or add to the OpenJDK code, that new -GPL2 code may still be combined with Designated Exception Modules if the -new code is made subject to this exception by its copyright holder. +As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code +to build an executable that includes those portions of necessary code that +Oracle could not provide under GPL2 (or that Oracle has provided under GPL2 +with the Classpath exception). If you modify or add to the OpenJDK code, +that new GPL2 code may still be combined with Designated Exception Modules +if the new code is made subject to this exception by its copyright holder.