Merge pull request #9 from Accelerator1996/master

Merge tag jdk8u312-ga
dragonwell-project · Nov 2, 2021 · 52dbd1f · 52dbd1f
2 parents 4687cc0 + 2f46ada
commit 52dbd1f
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 27 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1088,5 +1088,14 @@ fe47621ed0b195c2b4a323cbaa5374f96ac978f5 jdk8u302-b02
 bea49c9fc6a7902fe872797e8683712f16bd3193 jdk8u302-b03
 a3ee7e77cb8e151df46372326dec9d48943f01f7 jdk8u302-b04
 0113b64bec625aeb2a43829475311c51ba942cc1 jdk8u302-b05
+0113b64bec625aeb2a43829475311c51ba942cc1 jdk8u312-b00
 55f9e93f9393d41edc2a609b417f6a05bc6a8253 jdk8u302-b06
 29ad7b1330146fcf1a0ee60a9a82995d2f324f9a jdk8u302-b07
+eae73754c31e3109b5e8fdd9a83e6e090b5a36b9 jdk8u302-b08
+eae73754c31e3109b5e8fdd9a83e6e090b5a36b9 jdk8u302-ga
+396d9b5a44b58632fbaab0d88c598349129ca1d2 jdk8u312-b01
+9e557fa24afb36ac9cd312632a2246fdeae07c75 jdk8u312-b02
+21ceec5ba311200cea9d20a1c18e2f74adba2f7f jdk8u312-b03
+68fd93243cf383402d0fb046647c015628bd0f45 jdk8u312-b04
+869edc64d5d0c548ecb8ee56e928b9e83cb9d95b jdk8u312-b05
+70fa0fdf6a6c3ec1b362efbbc3f40632e4ae3030 jdk8u312-b06
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
@@ -3243,39 +3243,75 @@ included with JRE 8, JDK 8, and OpenJDK 8.
 -------------------------------------------------------------------------------
 
 %% 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.
+Interface v3.0,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-Copyright (c) OASIS Open 2016. All Rights Reserved.
+Copyright © OASIS Open 2020. 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:
+    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.
+    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.
+
+    [OASIS requests that any OASIS Party or any other party that
+believes it has patent claims that would necessarily be infringed by
+implementations of this OASIS Standards Final Deliverable, to notify
+OASIS TC Administrator and provide an indication of its willingness to
+grant patent licenses to such patent claims in a manner consistent with
+the IPR Mode of the OASIS Technical Committee that produced this
+deliverable.]
+
+    [OASIS invites any party to contact the OASIS TC Administrator if it
+is aware of a claim of ownership of any patent claims that would
+necessarily be infringed by implementations of this OASIS Standards
+Final Deliverable by a patent holder that is not willing to provide a
+license to such patent claims in a manner consistent with the IPR Mode
+of the OASIS Technical Committee that produced this OASIS Standards
+Final Deliverable. OASIS may include such claims on its website, but
+disclaims any obligation to do so.]
+
+    [OASIS takes no position regarding the validity or scope of any
+intellectual property or other rights that might be claimed to pertain
+to the implementation or use of the technology described in this OASIS
+Standards Final Deliverable or the extent to which any license under
+such rights might or might not be available; neither does it represent
+that it has made any effort to identify any such rights. Information on
+OASIS' procedures with respect to rights in any document or deliverable
+produced by an OASIS Technical Committee can be found on the OASIS
+website. Copies of claims of rights made available for publication and
+any assurances of licenses to be made available, or the result of an
+attempt made to obtain a general license or permission for the use of
+such proprietary rights by implementers or users of this OASIS Standards
+Final Deliverable, can be obtained from the OASIS TC Administrator.
+OASIS makes no representation that any information or list of
+intellectual property rights will at any time be complete, or that any
+claims in such list are, in fact, Essential Claims.]
 
 --- end of LICENSE ---