# HG changeset patch # User aoqi # Date 1603528972 -28800 # Node ID a487b135ef8e97f14f6ff58edbbb040a99c95ee8 # Parent d4f03ee6b8f2e63037bbfe54e9bf54ab1c6428f0# Parent 75460f3d14244842fa557130b7d573dafa0b55f0 Merge diff -r d4f03ee6b8f2 -r a487b135ef8e .hgtags --- a/.hgtags Sat Oct 24 16:18:46 2020 +0800 +++ b/.hgtags Sat Oct 24 16:42:52 2020 +0800 @@ -1105,8 +1105,23 @@ 541794915ecb1043b1f68f74778d44155610cdbf jdk8u262-b03 1d0763331a525db2b7281159d1325be53e17e898 jdk8u262-b04 61a6c87db285a79da7f90ac95916a591e95ba359 jdk8u262-b05 +61a6c87db285a79da7f90ac95916a591e95ba359 jdk8u272-b00 c4db66b4dcf7da619465874f9b87d7a3840fb239 jdk8u262-b06 7709711670b4f2994499684c4b4356e224764af9 jdk8u262-b07 839f2cd2a1817734a3aa39e5ce2980f0873722a9 jdk8u262-b08 ad521427e273fe14ea5d0cf6d1dc62c81148fd8b jdk8u262-b09 +2c87084c0b09c598674425475895bbf3da52e385 jdk8u262-b10 +2c87084c0b09c598674425475895bbf3da52e385 jdk8u262-ga 97c6e2f0de10da6c4c16223dc0d63499901ee906 mips-jdk8u262-b10 +2c87084c0b09c598674425475895bbf3da52e385 jdk8u265-b00 +985114dd4afc7fef23145fa33c7bbb835c1dfc3a jdk8u265-b01 +985114dd4afc7fef23145fa33c7bbb835c1dfc3a jdk8u265-ga +c962b0325d3e46a3168d592d9be0d008db74d3a6 jdk8u272-b01 +a702bd3d9db12178cfdd95e862659fe2e8d43e30 jdk8u272-b02 +eea7b1a818e9ed1019ebfeb15c4cbc82542c58ea jdk8u272-b03 +33e9ed39edb721cb28fb9892adba8215429a210e jdk8u272-b04 +dd27c46e8310ffde17f8f902d9d331b971facce2 jdk8u272-b05 +f4d4a3f880dab178d630b042be93528d6b2e8227 jdk8u272-b06 +2d2435272dddfcebdbb52b6217f51794a42016c2 jdk8u272-b07 +d652c48a90eb54c3d8ac7fd2d6bc98af2d6ca5f9 jdk8u272-b08 +244b07da2440e58627c8efea6c2095e6fde6fd10 jdk8u272-b09 diff -r d4f03ee6b8f2 -r a487b135ef8e THIRD_PARTY_README --- a/THIRD_PARTY_README Sat Oct 24 16:18:46 2020 +0800 +++ b/THIRD_PARTY_README Sat Oct 24 16:42:52 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 --- + +-------------------------------------------------------------------------------