# HG changeset patch # User aoqi # Date 1603528978 -28800 # Node ID f3a126a74fb4bdc324e07e296071481b904331d3 # Parent c37997e762be9e5e13df80f83e079d04cf0037c4# Parent 1dc430818e0cb46c536c4c7b72be2d7f395156b0 Merge diff -r c37997e762be -r f3a126a74fb4 .hgtags --- a/.hgtags Sat Oct 24 16:18:48 2020 +0800 +++ b/.hgtags Sat Oct 24 16:42:58 2020 +0800 @@ -1063,8 +1063,23 @@ a708c11c582dce75a6b134e4dfb6f3f3aa05ef8d jdk8u262-b03 caa13cd34f715d6db597adca78732b94f3728bae jdk8u262-b04 96946cef7eade1693fe6dbd2e6001f36defb0295 jdk8u262-b05 +96946cef7eade1693fe6dbd2e6001f36defb0295 jdk8u272-b00 0e54ba3037a2a8d5c93d8909aeaa75f9e55bf82a jdk8u262-b06 494c863af128b32c7462e49c32ce3a422033e4d2 jdk8u262-b07 cb41a9e2bafd0e332c5906dde9840816dc279b9c jdk8u262-b08 cd7ed8c648058a8fa01242d73e9754f455559c3e jdk8u262-b09 +7347ed2df76baff282a0a890724fb66e84291b0e jdk8u262-b10 +7347ed2df76baff282a0a890724fb66e84291b0e jdk8u262-ga dde657df79e0d68bcc672001fd93efac019eedc8 mips-jdk8u262-b10 +7347ed2df76baff282a0a890724fb66e84291b0e jdk8u265-b00 +94d6ff459027c2bda81ac79b6e0286c2f23c8146 jdk8u265-b01 +94d6ff459027c2bda81ac79b6e0286c2f23c8146 jdk8u265-ga +38d13ac335fe2f1f2d9c8dd6607fc3973824a4e7 jdk8u272-b01 +7aeb5d972262795d232457bc11ca543643c54af3 jdk8u272-b02 +c87827b363e75a6eee6c34b93f070ce06765d0cf jdk8u272-b03 +d73f32c769de27245978704020f57e829a02cf5c jdk8u272-b04 +5c3121f1439935cba32ca85366e925ac7090448c jdk8u272-b05 +eb8412f04a3e99bf562c7aca947b862fc13957ef jdk8u272-b06 +52516d7a2504137a3100b39824e0d3915b7451db jdk8u272-b07 +1c99ddb9d546b756533a4af78222cd07de996fa6 jdk8u272-b08 +d416f2a0773a0e53a60ed165827d7d5313941cb2 jdk8u272-b09 diff -r c37997e762be -r f3a126a74fb4 THIRD_PARTY_README --- a/THIRD_PARTY_README Sat Oct 24 16:18:48 2020 +0800 +++ b/THIRD_PARTY_README Sat Oct 24 16:42:58 2020 +0800 @@ -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 --- @@ -3028,8 +3028,7 @@ Apache Commons Math 3.2 Apache Derby 10.11.1.2 Apache Jakarta BCEL 5.1 - Apache Jakarta Regexp 1.4 - Apache Santuario XML Security for Java 1.5.4 + Apache Santuario XML Security for Java 2.1.1 Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1 @@ -3243,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 --- + +-------------------------------------------------------------------------------