Mercurial > hg > icedtea8-forest > nashorn
changeset 2662:347f82a7813a icedtea-3.17.0
Merge jdk8u272-ga
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Tue, 27 Oct 2020 06:33:37 +0000 |
parents | fc87bc126e85 (current diff) b16b18e4d2f6 (diff) |
children | a24b8f8569db |
files | .hgtags |
diffstat | 2 files changed, 47 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Oct 27 03:35:20 2020 +0000 +++ b/.hgtags Tue Oct 27 06:33:37 2020 +0000 @@ -1159,3 +1159,11 @@ cf78b728ecca3ddd206a7bdbd9deb74eca80cf40 jdk8u272-b02 1409bb48eea8631fffab1a9d2903cf9f68aeb124 jdk8u272-b03 3c07ff843d55b75574a4902f1a59d501a36daf35 icedtea-3.17.0pre02 +d90c85ae0004869d8f6c980d20e44ff513ff743e jdk8u272-b04 +5e0be06a9cf23ac7a73e056f23505dcc1639709f jdk8u272-b05 +f819244537cf8958f82c1c3c1fd32bbd89e956db jdk8u272-b06 +7ee1ab38e286ab80a05fdfbe15e9694ae55d9d7f jdk8u272-b07 +7b821bf9d092a5ab6d8bbb63590cd45e86738170 jdk8u272-b08 +384ba0e962c88a2d84bdb590847a6db91286c2fb jdk8u272-b09 +65ff5c46b9ac976ababa9361872112d35318fdf4 jdk8u272-b10 +65ff5c46b9ac976ababa9361872112d35318fdf4 jdk8u272-ga
--- a/THIRD_PARTY_README Tue Oct 27 03:35:20 2020 +0000 +++ b/THIRD_PARTY_README Tue Oct 27 06:33:37 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 --- + +-------------------------------------------------------------------------------