Skip to content

Commit 1c275fa

Browse files
steve-sgilles-duboscq
authored andcommitted
[GR-45896] Backport: upgrade JLine3 to 3.23.
PullRequest: graal/14700
2 parents cc2d1b2 + fa8a4eb commit 1c275fa

File tree

4 files changed

+8
-28
lines changed

4 files changed

+8
-28
lines changed

sdk/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
This changelog summarizes major changes between GraalVM SDK versions. The main focus is on APIs exported by GraalVM SDK.
44

55
## Version 23.0.0
6+
* (GR-45896) JLine3 upgrade from 3.16 to 3.23. The JLine3 bundle that is used is customized and contains only `jline3-reader`, `jline3-terminal`, and `jline3-builtins` JLine3 components.
67
* (GR-26758) Added the [TraceLimits](https://www.graalvm.org/reference-manual/embed-languages/sandbox-resource-limits#determining-sandbox-resource-limits) option to the Truffle Sandbox to measure a guest application's resource consumption and obtain realistic sandbox parameters.
78
* (GR-25849) (GR-41634) Added a new way to configure the IO access using the new class `IOAccess`. The IO access configuration determines how a guest language can access the host IO. The `IOAccess` class provides a predefined configuration to [disable](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/io/IOAccess.html#NONE) host IO access, or to [enable](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/io/IOAccess.html#ALL) full host IO access. A custom configuration can be created using an IOAccess [builder](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/io/IOAccess.html#newBuilder--).
89
* Deprecated `Context.Builder#allowIO(boolean)` To migrate, use `builder.allowIO(IOAccess.ALL)` to enable unrestricted IO operations on the host system, or `builder.allowIO(IOAccess.NONE)` to disable IO operations.

sdk/mx.sdk/suite.py

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# The Universal Permissive License (UPL), Version 1.0
@@ -126,43 +126,22 @@
126126
}
127127
},
128128
"JLINE3" : {
129-
"digest" : "sha512:d9518c40e206950b3815593de83b1e3632896096407937f15646c81c69f167900c67bd88f3ff2b86258960bbd108d3c0cf09a1ad7cfbf1be489b2af4feccbb58",
130-
"version" : "3.16.0.3",
129+
"digest" : "sha512:5dd249dbcf35677f0d8390d4a55526c5f7a037349382b344e861278d7129b169849ddba049a2d51202f820471dd4259b9571ab71e483b718220cc404bc93fb3d",
130+
"version" : "3.23.0.1",
131131
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/jline3-shadowed-{version}.jar"],
132132
"license" : "BSD-new",
133133
"requires" : ["java.logging"],
134134
"exports" : [
135-
"org.graalvm.shadowed.org.fusesource.hawtjni.runtime",
136-
"org.graalvm.shadowed.org.fusesource.jansi",
137-
"org.graalvm.shadowed.org.fusesource.jansi.internal",
138135
"org.graalvm.shadowed.org.jline.builtins",
139-
"org.graalvm.shadowed.org.jline.builtins.ssh",
140-
"org.graalvm.shadowed.org.jline.builtins.telnet",
141-
"org.graalvm.shadowed.org.jline.console",
142-
"org.graalvm.shadowed.org.jline.console.impl",
143136
"org.graalvm.shadowed.org.jline.keymap",
144137
"org.graalvm.shadowed.org.jline.reader",
145138
"org.graalvm.shadowed.org.jline.reader.impl",
146139
"org.graalvm.shadowed.org.jline.reader.impl.completer",
147140
"org.graalvm.shadowed.org.jline.reader.impl.history",
148-
"org.graalvm.shadowed.org.jline.style",
149141
"org.graalvm.shadowed.org.jline.terminal",
150142
"org.graalvm.shadowed.org.jline.terminal.impl",
151-
"org.graalvm.shadowed.org.jline.terminal.impl.jansi",
152-
"org.graalvm.shadowed.org.jline.terminal.impl.jansi.freebsd",
153-
"org.graalvm.shadowed.org.jline.terminal.impl.jansi.linux",
154-
"org.graalvm.shadowed.org.jline.terminal.impl.jansi.osx",
155-
"org.graalvm.shadowed.org.jline.terminal.impl.jansi.solaris",
156-
"org.graalvm.shadowed.org.jline.terminal.impl.jansi.win",
157-
"org.graalvm.shadowed.org.jline.terminal.impl.jna",
158-
"org.graalvm.shadowed.org.jline.terminal.impl.jna.freebsd",
159-
"org.graalvm.shadowed.org.jline.terminal.impl.jna.linux",
160-
"org.graalvm.shadowed.org.jline.terminal.impl.jna.osx",
161-
"org.graalvm.shadowed.org.jline.terminal.impl.jna.solaris",
162-
"org.graalvm.shadowed.org.jline.terminal.impl.jna.win",
163143
"org.graalvm.shadowed.org.jline.terminal.spi",
164144
"org.graalvm.shadowed.org.jline.utils",
165-
"org.graalvm.shadowed.org.jline.widget",
166145
],
167146
},
168147
"LLVM_ORG" : {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Args = --features=com.oracle.svm.thirdparty.jline.JLine3Feature \
2-
--add-exports=java.base/jdk.internal.module=ALL-UNNAMED \
1+
Args = --add-exports=java.base/jdk.internal.module=ALL-UNNAMED \
32
--features=org.graalvm.launcher.JLine3FeatureModuleAccessFeature \
4-
--initialize-at-build-time=org.graalvm.launcher \
3+
--features=org.graalvm.shadowed.org.jline.JLine3Feature \
4+
--initialize-at-build-time=org.graalvm.launcher,org.graalvm.shadowed.org.jline \
55
-H:JNIConfigurationResources=${.}/launcher.jniconfig

vm/mx.vm/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
{
5959
"name": "truffleruby",
60-
"version": "b2104912061d69d4767ef6d3cf294aa58e1a93bf",
60+
"version": "6ccde34aa2356355f58be836b0b020ec613a9cd7",
6161
"dynamic": True,
6262
"urls": [
6363
{"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

0 commit comments

Comments
 (0)