# HG changeset patch # User Andrew John Hughes # Date 1603780415 0 # Node ID 83b7a751f44f5c65b847f243e2e8a3c87ab144dc # Parent 0a041bdee4f36df9770056afc2915869ec061dde# Parent c4260ce5d0699e577fd6f39010c358d73a48b495 Merge jdk8u272-ga diff -r 0a041bdee4f3 -r 83b7a751f44f .hgtags --- a/.hgtags Tue Oct 27 03:35:19 2020 +0000 +++ b/.hgtags Tue Oct 27 06:33:35 2020 +0000 @@ -1128,3 +1128,11 @@ 54f67143c9566104641b6c69ce33f541d0f5f350 jdk8u272-b02 4e02b68de4582b99db1331852cb731914a47adba jdk8u272-b03 4ea625a4e1562077914fc6b5084646aec90b8635 icedtea-3.17.0pre02 +a317abfcbd909b1c094e250afb0cb618e363e938 jdk8u272-b04 +f1fa9a70296a0ce38c6e315fb3ee107aa32f6b42 jdk8u272-b05 +b974f43a589fa0ca7be9d0a62673929229a2a4e7 jdk8u272-b06 +a56fbe019ae89f55aae083d29b24f83290affe5d jdk8u272-b07 +462446582ece03a945b8d6b7714ac3c19f07ff25 jdk8u272-b08 +acab1eb3dc4c828f87500709d05ea2293baed60c jdk8u272-b09 +68a2632bf926ed13c20af12d3c5d1b3e79f3acb9 jdk8u272-b10 +68a2632bf926ed13c20af12d3c5d1b3e79f3acb9 jdk8u272-ga diff -r 0a041bdee4f3 -r 83b7a751f44f THIRD_PARTY_README --- a/THIRD_PARTY_README Tue Oct 27 03:35:19 2020 +0000 +++ b/THIRD_PARTY_README Tue Oct 27 06:33:35 2020 +0000 @@ -2240,7 +2240,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite v1.8.24, +%% This notice is provided with respect to PC/SC Lite v1.8.26, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- @@ -3242,3 +3242,41 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token +Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8. + +--- begin of LICENSE --- + +Copyright (c) OASIS Open 2016. All Rights Reserved. + +All capitalized terms in the following text have the meanings assigned to them +in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +full Policy may be found at the OASIS website: +[http://www.oasis-open.org/policies-guidelines/ipr] + +This document and translations of it may be copied and furnished to others, and +derivative works that comment on or otherwise explain it or assist in its +implementation may be prepared, copied, published, and distributed, in whole or +in part, without restriction of any kind, provided that the above copyright +notice and this section are included on all such copies and derivative works. +However, this document itself may not be modified in any way, including by +removing the copyright notice or references to OASIS, except as needed for the +purpose of developing any document or deliverable produced by an OASIS +Technical Committee (in which case the rules applicable to copyrights, as set +forth in the OASIS IPR Policy, must be followed) or as required to translate it +into languages other than English. + +The limited permissions granted above are perpetual and will not be revoked by +OASIS or its successors or assigns. + +This document and the information contained herein is provided on an "AS IS" +basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE +OF THIS DOCUMENT OR ANY PART THEREOF. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- diff -r 0a041bdee4f3 -r 83b7a751f44f src/share/classes/com/sun/tools/javac/resources/legacy.properties --- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties Tue Oct 27 03:35:19 2020 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties Tue Oct 27 06:33:35 2020 +0000 @@ -143,6 +143,7 @@ com.sun.jndi.ldap.ext = tiger legacy com.sun.jndi.ldap.pool = tiger legacy com.sun.jndi.ldap.sasl = tiger legacy +com.sun.jndi.ldap.spi = tiger legacy com.sun.jndi.rmi.registry = tiger legacy com.sun.jndi.toolkit.corba = tiger legacy com.sun.jndi.toolkit.ctx = tiger legacy diff -r 0a041bdee4f3 -r 83b7a751f44f src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java --- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Tue Oct 27 03:35:19 2020 +0000 +++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Tue Oct 27 06:33:35 2020 +0000 @@ -500,6 +500,7 @@ "org.w3c.dom.css", "org.w3c.dom.events", "org.w3c.dom.views", + "com.sun.jndi.ldap.spi", "com.sun.management", "com.sun.security.auth", "com.sun.security.auth.callback",