GH-359 upgrade to GraalVM 21.3

thurka · thurka · commit 981321069fae · 2021-11-01T14:20:54.000+01:00
diff --git a/plugins/graaljs/external/binaries-list b/plugins/graaljs/external/binaries-list
@@ -1,7 +1,7 @@
-4302CDDDA6689ABACBD7ED3B93D36C1E6F981041 org.graalvm.js:js-scriptengine:20.3.0
-BCB6EB7175DEABD6A1D6351E0A68AED43D713A5F org.graalvm.js:js:20.3.0
-6D6049F8743F2F2FBAA51393EA6833CD28FED04D org.graalvm.regex:regex:20.3.0
-F20DA0BA9579D4152B57CF67538A1B8279C77CB0 org.graalvm.truffle:truffle-api:20.3.0
-8E62643FD621053E00EE52D797C7FBD08D7FDEDC org.graalvm.sdk:graal-sdk:20.3.0
-2E159807158095566726600534034030DDDAB6D0 com.ibm.icu:icu4j:67.1
+01841330B498CD7D035BAD6B00B38C448DB2E8A1 org.graalvm.js:js-scriptengine:21.3.0
+7E49DDEE95AC60C4965A50518F405920E4704824 org.graalvm.js:js:21.3.0
+173A93670277B3F538C9612859D0C59D6D4DD190 org.graalvm.regex:regex:21.3.0
+C2CA434CF80F81C57C79F3F9B9BE7A7C3452F531 org.graalvm.truffle:truffle-api:21.3.0
+1AC4538804C9E18787CE66CF504FBFA4E8AF5353 org.graalvm.sdk:graal-sdk:21.3.0
+FF666AC55986650893AACB9E2E0003538E9799C0 com.ibm.icu:icu4j:69.1
 A3AE34E57FA8A4040E28247291D0CC3D6B8C7BCF org.ow2.asm:asm-util:7.2
diff --git a/plugins/graaljs/external/icu4j-69.1-license.txt b/plugins/graaljs/external/icu4j-69.1-license.txt
@@ -281,31 +281,29 @@ property of their respective owners.
 
 3. Lao Word Break Dictionary Data (laodict.txt)
 
- #  Copyright (c) 2013 International Business Machines Corporation
- #  and others. All Rights Reserved.
+ # Copyright (C) 2016 and later: Unicode, Inc. and others.
+ # License & terms of use: http://www.unicode.org/copyright.html
+ # Copyright (c) 2015 International Business Machines Corporation
+ # and others. All Rights Reserved.
  #
- # Project: http://code.google.com/p/lao-dictionary/
- # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
- # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
- #              (copied below)
+ # Project: https://github.com/rober42539/lao-dictionary
+ # Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt
+ # License: https://github.com/rober42539/lao-dictionary/LICENSE.txt
+ #          (copied below)
  #
- #  This file is derived from the above dictionary, with slight
- #  modifications.
+ #	This file is derived from the above dictionary version of Nov 22, 2020
  #  ----------------------------------------------------------------------
  #  Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
  #  All rights reserved.
  #
  #  Redistribution and use in source and binary forms, with or without
- #  modification,
- #  are permitted provided that the following conditions are met:
- #
- #
- # Redistributions of source code must retain the above copyright notice, this
- #  list of conditions and the following disclaimer. Redistributions in
- #  binary form must reproduce the above copyright notice, this list of
- #  conditions and the following disclaimer in the documentation and/or
- #  other materials provided with the distribution.
+ #  modification, are permitted provided that the following conditions are met:
  #
+ #  Redistributions of source code must retain the above copyright notice, this
+ #  list of conditions and the following disclaimer. Redistributions in binary
+ #  form must reproduce the above copyright notice, this list of conditions and
+ #  the following disclaimer in the documentation and/or other materials
+ #  provided with the distribution.
  #
  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -412,103 +410,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
----------------------
-
-Third-Party Software Licenses
-
-This section contains third-party software notices and/or additional
-terms for licensed third-party software components included within ICU
-libraries.
-
-1. ICU License - ICU 1.8.1 to ICU 57.1
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1995-2016 International Business Machines Corporation and others
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-All trademarks and registered trademarks mentioned herein are the
-property of their respective owners.
-
-
-——————————————————————————————————————————————————————————————————————
-
-
-From: https://www.unicode.org/copyright.html:
-
-    Unicode® Copyright and Terms of Use
-
-    For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
-
-        Unicode Copyright
-            Copyright © 1991-2020 Unicode, Inc. All rights reserved.
-        Definitions
-
-        Unicode Data Files ("DATA FILES") include all data files under the directories:
-        https://www.unicode.org/Public/
-        https://www.unicode.org/reports/
-        https://www.unicode.org/ivd/data/
-
-        Unicode Data Files do not include PDF online code charts under the directory:
-        https://www.unicode.org/Public/
-
-        Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard
-        or any source code or compiled code under the directories:
-        https://www.unicode.org/Public/PROGRAMS/
-        https://www.unicode.org/Public/cldr/
-        http://site.icu-project.org/download/
-
-        Terms of Use
-            Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein.
-            Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein.
-            Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License.
-            Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page.
-            The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart.
-            All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use.
-            No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site.
-            Modification is not permitted with respect to this document. All copies of this document must be verbatim.
-        Restricted Rights Legend
-            Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement.
-        Warranties and Disclaimers
-            This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time.
-            If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase.
-            EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
-        Waiver of Damages
-            In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives.
-        Trademarks & Logos
-            The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names.
-            The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc.
-            All third party trademarks referenced herein are the property of their respective owners.
-        Miscellaneous
-            Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum.
-            Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent.
-            Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income.
-            Severability.  If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect.
-            Entire Agreement. This Agreement constitutes the entire agreement between the parties.
diff --git a/plugins/graaljs/external/js-21.3.0-license.txt b/plugins/graaljs/external/js-21.3.0-license.txt
@@ -2,10 +2,10 @@ Name: GraalJS
 Description: A high performance implementation of the JavaScript programming language. Built on the GraalVM by Oracle Labs.
 License: UPL
 Origin: https://github.com/oracle/graal
-Version: 20.3.0
-Files: js-20.3.0.jar, js-scriptengine-20.3.0.jar, regex-20.3.0.jar, truffle-api-20.3.0.jar, graal-sdk-20.3.0.jar,
+Version: 21.3.0
+Files: js-21.3.0.jar, js-scriptengine-21.3.0.jar, regex-21.3.0.jar, truffle-api-21.3.0.jar, graal-sdk-21.3.0.jar,
 
-Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
 
 The Universal Permissive License (UPL), Version 1.0
 
diff --git a/plugins/graaljs/manifest.mf b/plugins/graaljs/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module-Java-Dependencies: Java > 15
 OpenIDE-Module: org.graalvm.visualvm.modules.graaljs
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/modules/graaljs/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 
diff --git a/plugins/graaljs/nbproject/project.properties b/plugins/graaljs/nbproject/project.properties
@@ -1,21 +1,21 @@
-file.reference.js-scriptengine-20.3.0.jar=external/js-scriptengine-20.3.0.jar
-file.reference.js-20.3.0.jar=external/js-20.3.0.jar
-file.reference.regex-20.3.0.jar=external/regex-20.3.0.jar
-file.reference.truffle-api-20.3.0.jar=external/truffle-api-20.3.0.jar
-file.reference.graal-sdk-20.3.0.jar=external/graal-sdk-20.3.0.jar
+file.reference.js-scriptengine-21.3.0.jar=external/js-scriptengine-21.3.0.jar
+file.reference.js-21.3.0.jar=external/js-21.3.0.jar
+file.reference.regex-21.3.0.jar=external/regex-21.3.0.jar
+file.reference.truffle-api-21.3.0.jar=external/truffle-api-21.3.0.jar
+file.reference.graal-sdk-21.3.0.jar=external/graal-sdk-21.3.0.jar
 file.reference.icu4j-67.1.jar=external/icu4j-67.1.jar
 file.reference.asm-util-7.2.jar=external/asm-util-7.2.jar
 is.eager=true
 license.file=../../visualvm/startup/src/org/graalvm/visualvm/modules/startup/LICENSE.txt
 nbm.homepage=https://visualvm.github.io
 nbm.module.author=Tomas Hurka
 nbm.needs.restart=true
-release.external/js-scriptengine-20.3.0.jar=modules/ext/js-scriptengine-20.3.0.jar
-release.external/js-20.3.0.jar=modules/ext/js-20.3.0.jar
-release.external/regex-20.3.0.jar=modules/ext/regex-20.3.0.jar
-release.external/truffle-api-20.3.0.jar=modules/ext/truffle-api-20.3.0.jar
-release.external/graal-sdk-20.3.0.jar=modules/ext/graal-sdk-20.3.0.jar
-release.external/icu4j-67.1.jar=modules/ext/icu4j-67.1.jar
+release.external/js-scriptengine-21.3.0.jar=modules/ext/js-scriptengine-21.3.0.jar
+release.external/js-21.3.0.jar=modules/ext/js-21.3.0.jar
+release.external/regex-21.3.0.jar=modules/ext/regex-21.3.0.jar
+release.external/truffle-api-21.3.0.jar=modules/ext/truffle-api-21.3.0.jar
+release.external/graal-sdk-21.3.0.jar=modules/ext/graal-sdk-21.3.0.jar
+release.external/icu4j-69.1.jar=modules/ext/icu4j-69.1.jar
 release.external/asm-util-7.2.jar=modules/ext/asm-util-7.2.jar
 
 javac.source=1.8
diff --git a/plugins/graaljs/nbproject/project.xml b/plugins/graaljs/nbproject/project.xml
@@ -17,28 +17,28 @@
             </module-dependencies>
             <public-packages/>
             <class-path-extension>
-                <runtime-relative-path>ext/js-scriptengine-20.3.0.jar</runtime-relative-path>
-                <binary-origin>external/js-scriptengine-20.3.0.jar</binary-origin>
+                <runtime-relative-path>ext/js-scriptengine-21.3.0.jar</runtime-relative-path>
+                <binary-origin>external/js-scriptengine-21.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/js-20.3.0.jar</runtime-relative-path>
-                <binary-origin>external/js-20.3.0.jar</binary-origin>
+                <runtime-relative-path>ext/js-21.3.0.jar</runtime-relative-path>
+                <binary-origin>external/js-21.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/regex-20.3.0.jar</runtime-relative-path>
-                <binary-origin>external/regex-20.3.0.jar</binary-origin>
+                <runtime-relative-path>ext/regex-21.3.0.jar</runtime-relative-path>
+                <binary-origin>external/regex-21.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/truffle-api-20.3.0.jar</runtime-relative-path>
-                <binary-origin>external/truffle-api-20.3.0.jar</binary-origin>
+                <runtime-relative-path>ext/truffle-api-21.3.0.jar</runtime-relative-path>
+                <binary-origin>external/truffle-api-21.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/graal-sdk-20.3.0.jar</runtime-relative-path>
-                <binary-origin>external/graal-sdk-20.3.0.jar</binary-origin>
+                <runtime-relative-path>ext/graal-sdk-21.3.0.jar</runtime-relative-path>
+                <binary-origin>external/graal-sdk-21.3.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/icu4j-67.1.jar</runtime-relative-path>
-                <binary-origin>external/icu4j-67.1.jar</binary-origin>
+                <runtime-relative-path>ext/icu4j-69.1.jar</runtime-relative-path>
+                <binary-origin>external/icu4j-69.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/asm-util-7.2.jar</runtime-relative-path>
