Skip to content

Commit b1b2655

Browse files
committed
GH-464 upgrade to GraalVM 22.3
1 parent d59a6a9 commit b1b2655

File tree

7 files changed

+155
-48
lines changed

7 files changed

+155
-48
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
01841330B498CD7D035BAD6B00B38C448DB2E8A1 org.graalvm.js:js-scriptengine:21.3.0
2-
7E49DDEE95AC60C4965A50518F405920E4704824 org.graalvm.js:js:21.3.0
3-
173A93670277B3F538C9612859D0C59D6D4DD190 org.graalvm.regex:regex:21.3.0
4-
C2CA434CF80F81C57C79F3F9B9BE7A7C3452F531 org.graalvm.truffle:truffle-api:21.3.0
5-
1AC4538804C9E18787CE66CF504FBFA4E8AF5353 org.graalvm.sdk:graal-sdk:21.3.0
6-
FF666AC55986650893AACB9E2E0003538E9799C0 com.ibm.icu:icu4j:69.1
7-
A3AE34E57FA8A4040E28247291D0CC3D6B8C7BCF org.ow2.asm:asm-util:7.2
1+
6267785D7EA4BCC1A0D3F40DE7D05B77A6C2BEEC org.graalvm.js:js-scriptengine:22.3.0
2+
42A5D241E5B92589DBF1CBB5DD3EAE0360707C8F org.graalvm.js:js:22.3.0
3+
3D88E01158436B353C4B54A396D209F9E2791CEF org.graalvm.regex:regex:22.3.0
4+
2E02DD479A207794D1A5A14B5A83D5556880C876 org.graalvm.truffle:truffle-api:22.3.0
5+
83179E3310A2ECE87266923FEDE5EF7355C68C9A org.graalvm.sdk:graal-sdk:22.3.0
6+
9E7D3304C23F9BA5CB71915F7CCE23231A57A445 com.ibm.icu:icu4j:71.1
7+
FBC178FC5BA3DAB50FD7E8A5317B8B647C8E8946 org.ow2.asm:asm-util:9.2

plugins/graaljs/external/icu4j-69.1-license.txt renamed to plugins/graaljs/external/icu4j-71.1-license.txt

Lines changed: 116 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1-
COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
1+
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
22

3-
Copyright © 1991-2020 Unicode, Inc. All rights reserved.
3+
See Terms of Use <https://www.unicode.org/copyright.html>
4+
for definitions of Unicode Inc.�s Data Files and Software.
5+
6+
NOTICE TO USER: Carefully read the following legal agreement.
7+
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
8+
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
9+
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
10+
TERMS AND CONDITIONS OF THIS AGREEMENT.
11+
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
12+
THE DATA FILES OR SOFTWARE.
13+
14+
COPYRIGHT AND PERMISSION NOTICE
15+
16+
Copyright � 1991-2022 Unicode, Inc. All rights reserved.
417
Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
518

619
Permission is hereby granted, free of charge, to any person obtaining
@@ -32,15 +45,17 @@ shall not be used in advertising or otherwise to promote the sale,
3245
use or other dealings in these Data Files or Software without prior
3346
written authorization of the copyright holder.
3447

35-
---------------------
48+
----------------------------------------------------------------------
3649

3750
Third-Party Software Licenses
3851

3952
This section contains third-party software notices and/or additional
4053
terms for licensed third-party software components included within ICU
4154
libraries.
4255

43-
1. ICU License - ICU 1.8.1 to ICU 57.1
56+
----------------------------------------------------------------------
57+
58+
ICU License - ICU 1.8.1 to ICU 57.1
4459

4560
COPYRIGHT AND PERMISSION NOTICE
4661

@@ -75,7 +90,9 @@ of the copyright holder.
7590
All trademarks and registered trademarks mentioned herein are the
7691
property of their respective owners.
7792

78-
2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
93+
----------------------------------------------------------------------
94+
95+
Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
7996

8097
# The Google Chrome software developed by Google is licensed under
8198
# the BSD license. Other software included in this distribution is
@@ -279,7 +296,9 @@ property of their respective owners.
279296
#
280297
# ---------------COPYING.ipadic-----END----------------------------------
281298

282-
3. Lao Word Break Dictionary Data (laodict.txt)
299+
----------------------------------------------------------------------
300+
301+
Lao Word Break Dictionary Data (laodict.txt)
283302

284303
# Copyright (C) 2016 and later: Unicode, Inc. and others.
285304
# License & terms of use: http://www.unicode.org/copyright.html
@@ -319,7 +338,9 @@ property of their respective owners.
319338
# OF THE POSSIBILITY OF SUCH DAMAGE.
320339
# --------------------------------------------------------------------------
321340

322-
4. Burmese Word Break Dictionary Data (burmesedict.txt)
341+
----------------------------------------------------------------------
342+
343+
Burmese Word Break Dictionary Data (burmesedict.txt)
323344

324345
# Copyright (c) 2014 International Business Machines Corporation
325346
# and others. All Rights Reserved.
@@ -359,7 +380,9 @@ property of their respective owners.
359380
# SUCH DAMAGE.
360381
# --------------------------------------------------------------------------
361382

362-
5. Time Zone Database
383+
----------------------------------------------------------------------
384+
385+
Time Zone Database
363386

364387
ICU uses the public domain data and code derived from Time Zone
365388
Database for its time zone support. The ownership of the TZ database
@@ -382,7 +405,9 @@ Database section 7.
382405
# making a contribution to the database or code waives all rights to
383406
# future claims in that contribution or in the TZ Database.
384407

385-
6. Google double-conversion
408+
----------------------------------------------------------------------
409+
410+
Google double-conversion
386411

387412
Copyright 2006-2011, the V8 project authors. All rights reserved.
388413
Redistribution and use in source and binary forms, with or without
@@ -410,3 +435,85 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
410435
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
411436
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
412437
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
438+
439+
----------------------------------------------------------------------
440+
441+
File: aclocal.m4 (only for ICU4C)
442+
Section: pkg.m4 - Macros to locate and utilise pkg-config.
443+
444+
445+
Copyright � 2004 Scott James Remnant <[email protected]>.
446+
Copyright � 2012-2015 Dan Nicholson <[email protected]>
447+
448+
This program is free software; you can redistribute it and/or modify
449+
it under the terms of the GNU General Public License as published by
450+
the Free Software Foundation; either version 2 of the License, or
451+
(at your option) any later version.
452+
453+
This program is distributed in the hope that it will be useful, but
454+
WITHOUT ANY WARRANTY; without even the implied warranty of
455+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
456+
General Public License for more details.
457+
458+
You should have received a copy of the GNU General Public License
459+
along with this program; if not, write to the Free Software
460+
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
461+
02111-1307, USA.
462+
463+
As a special exception to the GNU General Public License, if you
464+
distribute this file as part of a program that contains a
465+
configuration script generated by Autoconf, you may include it under
466+
the same distribution terms that you use for the rest of that
467+
program.
468+
469+
470+
(The condition for the exception is fulfilled because
471+
ICU4C includes a configuration script generated by Autoconf,
472+
namely the `configure` script.)
473+
474+
----------------------------------------------------------------------
475+
476+
File: config.guess (only for ICU4C)
477+
478+
479+
This file is free software; you can redistribute it and/or modify it
480+
under the terms of the GNU General Public License as published by
481+
the Free Software Foundation; either version 3 of the License, or
482+
(at your option) any later version.
483+
484+
This program is distributed in the hope that it will be useful, but
485+
WITHOUT ANY WARRANTY; without even the implied warranty of
486+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
487+
General Public License for more details.
488+
489+
You should have received a copy of the GNU General Public License
490+
along with this program; if not, see <https://www.gnu.org/licenses/>.
491+
492+
As a special exception to the GNU General Public License, if you
493+
distribute this file as part of a program that contains a
494+
configuration script generated by Autoconf, you may include it under
495+
the same distribution terms that you use for the rest of that
496+
program. This Exception is an additional permission under section 7
497+
of the GNU General Public License, version 3 ("GPLv3").
498+
499+
500+
(The condition for the exception is fulfilled because
501+
ICU4C includes a configuration script generated by Autoconf,
502+
namely the `configure` script.)
503+
504+
----------------------------------------------------------------------
505+
506+
File: install-sh (only for ICU4C)
507+
508+
509+
Copyright 1991 by the Massachusetts Institute of Technology
510+
511+
Permission to use, copy, modify, distribute, and sell this software and its
512+
documentation for any purpose is hereby granted without fee, provided that
513+
the above copyright notice appear in all copies and that both that
514+
copyright notice and this permission notice appear in supporting
515+
documentation, and that the name of M.I.T. not be used in advertising or
516+
publicity pertaining to distribution of the software without specific,
517+
written prior permission. M.I.T. makes no representations about the
518+
suitability of this software for any purpose. It is provided "as is"
519+
without express or implied warranty.

plugins/graaljs/external/js-21.3.0-license.txt renamed to plugins/graaljs/external/js-22.3.0-license.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Name: GraalJS
22
Description: A high performance implementation of the JavaScript programming language. Built on the GraalVM by Oracle Labs.
33
License: UPL
44
Origin: https://github.com/oracle/graal
5-
Version: 21.3.0
6-
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,
5+
Version: 22.3.0
6+
Files: js-22.3.0.jar, js-scriptengine-22.3.0.jar, regex-22.3.0.jar, truffle-api-22.3.0.jar, graal-sdk-22.3.0.jar,
77

8-
Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
8+
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
99

1010
The Universal Permissive License (UPL), Version 1.0
1111

plugins/graaljs/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: true
33
OpenIDE-Module-Java-Dependencies: Java > 15
44
OpenIDE-Module: org.graalvm.visualvm.modules.graaljs
55
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/modules/graaljs/Bundle.properties
6-
OpenIDE-Module-Specification-Version: 1.2
6+
OpenIDE-Module-Specification-Version: 1.3
77

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
file.reference.js-scriptengine-21.3.0.jar=external/js-scriptengine-21.3.0.jar
2-
file.reference.js-21.3.0.jar=external/js-21.3.0.jar
3-
file.reference.regex-21.3.0.jar=external/regex-21.3.0.jar
4-
file.reference.truffle-api-21.3.0.jar=external/truffle-api-21.3.0.jar
5-
file.reference.graal-sdk-21.3.0.jar=external/graal-sdk-21.3.0.jar
6-
file.reference.icu4j-67.1.jar=external/icu4j-67.1.jar
7-
file.reference.asm-util-7.2.jar=external/asm-util-7.2.jar
1+
file.reference.js-scriptengine-22.3.0.jar=external/js-scriptengine-22.3.0.jar
2+
file.reference.js-22.3.0.jar=external/js-22.3.0.jar
3+
file.reference.regex-22.3.0.jar=external/regex-22.3.0.jar
4+
file.reference.truffle-api-22.3.0.jar=external/truffle-api-22.3.0.jar
5+
file.reference.graal-sdk-22.3.0.jar=external/graal-sdk-22.3.0.jar
6+
file.reference.icu4j-71.1.jar=external/icu4j-71.1.jar
7+
file.reference.asm-util-9.2.jar=external/asm-util-9.2.jar
88
is.eager=true
99
license.file=../../visualvm/startup/src/org/graalvm/visualvm/modules/startup/LICENSE.txt
1010
nbm.homepage=https://visualvm.github.io
1111
nbm.module.author=Tomas Hurka
1212
nbm.needs.restart=true
13-
release.external/js-scriptengine-21.3.0.jar=modules/ext/js-scriptengine-21.3.0.jar
14-
release.external/js-21.3.0.jar=modules/ext/js-21.3.0.jar
15-
release.external/regex-21.3.0.jar=modules/ext/regex-21.3.0.jar
16-
release.external/truffle-api-21.3.0.jar=modules/ext/truffle-api-21.3.0.jar
17-
release.external/graal-sdk-21.3.0.jar=modules/ext/graal-sdk-21.3.0.jar
18-
release.external/icu4j-69.1.jar=modules/ext/icu4j-69.1.jar
19-
release.external/asm-util-7.2.jar=modules/ext/asm-util-7.2.jar
13+
release.external/js-scriptengine-22.3.0.jar=modules/ext/js-scriptengine-22.3.0.jar
14+
release.external/js-22.3.0.jar=modules/ext/js-22.3.0.jar
15+
release.external/regex-22.3.0.jar=modules/ext/regex-22.3.0.jar
16+
release.external/truffle-api-22.3.0.jar=modules/ext/truffle-api-22.3.0.jar
17+
release.external/graal-sdk-22.3.0.jar=modules/ext/graal-sdk-22.3.0.jar
18+
release.external/icu4j-71.1.jar=modules/ext/icu4j-71.1.jar
19+
release.external/asm-util-9.2.jar=modules/ext/asm-util-9.2.jar
2020

2121
javac.source=1.8
2222
javac.compilerargs=-Xlint -Xlint:-serial

plugins/graaljs/nbproject/project.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@
1717
</module-dependencies>
1818
<public-packages/>
1919
<class-path-extension>
20-
<runtime-relative-path>ext/js-scriptengine-21.3.0.jar</runtime-relative-path>
21-
<binary-origin>external/js-scriptengine-21.3.0.jar</binary-origin>
20+
<runtime-relative-path>ext/js-scriptengine-22.3.0.jar</runtime-relative-path>
21+
<binary-origin>external/js-scriptengine-22.3.0.jar</binary-origin>
2222
</class-path-extension>
2323
<class-path-extension>
24-
<runtime-relative-path>ext/js-21.3.0.jar</runtime-relative-path>
25-
<binary-origin>external/js-21.3.0.jar</binary-origin>
24+
<runtime-relative-path>ext/js-22.3.0.jar</runtime-relative-path>
25+
<binary-origin>external/js-22.3.0.jar</binary-origin>
2626
</class-path-extension>
2727
<class-path-extension>
28-
<runtime-relative-path>ext/regex-21.3.0.jar</runtime-relative-path>
29-
<binary-origin>external/regex-21.3.0.jar</binary-origin>
28+
<runtime-relative-path>ext/regex-22.3.0.jar</runtime-relative-path>
29+
<binary-origin>external/regex-22.3.0.jar</binary-origin>
3030
</class-path-extension>
3131
<class-path-extension>
32-
<runtime-relative-path>ext/truffle-api-21.3.0.jar</runtime-relative-path>
33-
<binary-origin>external/truffle-api-21.3.0.jar</binary-origin>
32+
<runtime-relative-path>ext/truffle-api-22.3.0.jar</runtime-relative-path>
33+
<binary-origin>external/truffle-api-22.3.0.jar</binary-origin>
3434
</class-path-extension>
3535
<class-path-extension>
36-
<runtime-relative-path>ext/graal-sdk-21.3.0.jar</runtime-relative-path>
37-
<binary-origin>external/graal-sdk-21.3.0.jar</binary-origin>
36+
<runtime-relative-path>ext/graal-sdk-22.3.0.jar</runtime-relative-path>
37+
<binary-origin>external/graal-sdk-22.3.0.jar</binary-origin>
3838
</class-path-extension>
3939
<class-path-extension>
40-
<runtime-relative-path>ext/icu4j-69.1.jar</runtime-relative-path>
41-
<binary-origin>external/icu4j-69.1.jar</binary-origin>
40+
<runtime-relative-path>ext/icu4j-71.1.jar</runtime-relative-path>
41+
<binary-origin>external/icu4j-71.1.jar</binary-origin>
4242
</class-path-extension>
4343
<class-path-extension>
44-
<runtime-relative-path>ext/asm-util-7.2.jar</runtime-relative-path>
45-
<binary-origin>external/asm-util-7.2.jar</binary-origin>
44+
<runtime-relative-path>ext/asm-util-9.2.jar</runtime-relative-path>
45+
<binary-origin>external/asm-util-9.2.jar</binary-origin>
4646
</class-path-extension>
4747
</data>
4848
</configuration>

0 commit comments

Comments
 (0)