Skip to content

Commit 69d89d2

Browse files
steve-swoess
authored andcommitted
[GR-61383] Graal SDK: upgrade JLine to 3.28.
PullRequest: graal/19730
2 parents 70a2b44 + 253eeda commit 69d89d2

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

sdk/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ For usages of the module-path pass the `--enable-native-access=org.graalvm.truff
1818
* GR-60022 Introduced the [FileSystem.newCompositeFileSystem](https://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/io/FileSystem.html#newCompositeFileSystem(org.graalvm.polyglot.io.FileSystem,org.graalvm.polyglot.io.FileSystem.Selector...)) method, which creates a composite `FileSystem` delegating operations to the specified delegate FileSystem instances based on the provided selectors.
1919
* GR-60022 Introduced the [FileSystem.newDenyIOFileSystem](https://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/io/FileSystem.html#newDenyIOFileSystem()) method, which creates a `FileSystem` that denies all file operations except for path parsing.
2020
* GR-57838 Added automatic inclusion of language and instrument resources for embedding Truffle languages in native image. We no longer produce a _resources_ folder next to the image by default. Documentation available [here](https://www.graalvm.org/reference-manual/embed-languages/#build-native-executables-from-polyglot-applications).
21+
* GR-61383 JLine3 upgrade from 3.23 to 3.28.
2122

2223
## Version 24.1.0
2324
* GR-51177 Enable random offsets of runtime compiled function entry points for the UNTRUSTED polyglot sandbox policy.

sdk/mx.sdk/suite.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,34 +127,34 @@
127127
},
128128
"JLINE_READER": {
129129
"moduleName": "org.jline.reader",
130-
"digest": "sha512:777733fa5d19f34386e4ff4ac578fb8ef3bbe160db5755dc551a5ec085dd3d966d74525be0e2d0c7bab222f03e09e28190cb5b263a92c63c6683a09332accf2e",
131-
"sourceDigest": "sha512:a0f4c316c46f06ea30a6c6819d5c129dccc74b43fd8ba0380646feec89b61d0465a052645ca699211aab931daa1216b26de064ca2be9e16dfe842d2fd2a91404",
130+
"digest": "sha512:dafd45af79a9874d7b41d146d37386da605e19ec2bf9c8989f121f9403902ce60ca9708fb016afed785186935d2dddd4b5b3304aca234c926b0e4368607b11ed",
131+
"sourceDigest": "sha512:f8ec62508f3e83278156b7bd14d5daded72976b10da63adac53be2f7b1c5e6c69340fac5b2f10ffe7e92d86b27425beee73e5d5b3c775e72595b47158bfbed1b",
132132
"maven": {
133133
"groupId": "org.jline",
134134
"artifactId": "jline-reader",
135-
"version": "3.23.0",
135+
"version": "3.28.0",
136136
},
137137
},
138138

139139
"JLINE_TERMINAL": {
140140
"moduleName": "org.jline.terminal",
141-
"digest": "sha512:d0d96389d750d6de82f4d8a29fc3756c0f28c19f520e761db69c6668b1e3fc9c2add30aee86ab7ac10426f2c075a63a0e5f7537096591fe585d8836f25c692ed",
142-
"sourceDigest": "sha512:931de13f023b9d15751c7e5b76ec9ad7811df19e7254146875ebd7e6d68e69764b916eef045ea743bd6d21515badeb1ddb795504d71ff1cad7e1b5889486c500",
141+
"digest": "sha512:abe0ad0303e5eb81b549301dfdcf34aace14495240816f14302d193296c7a8be31488e468d18a215976b8e4e8fa29f72d830e492eed7d4a6f9f04c81a6e36c3c",
142+
"sourceDigest": "sha512:cb70ad2bee2f7713fa5358c16fc7c53974c862e33957d3ec809468abcbc0b20de8546ecb41955dcc2003e702e5469069fd856a1ce51b132e29d0286beec4fe7e",
143143
"maven": {
144144
"groupId": "org.jline",
145145
"artifactId": "jline-terminal",
146-
"version": "3.23.0",
146+
"version": "3.28.0",
147147
},
148148
},
149149

150150
"JLINE_BUILTINS": {
151151
"moduleName": "org.jline.builtins",
152-
"digest": "sha512:166920f4252b4d6618a29aabc0e501930807c84df53cc727d238005aefc453b7c915345daa6653d281077e9dc25d3eb2f5a13ac9ceee1e230d9fd83b38113e32",
153-
"sourceDigest": "sha512:9b1c2cf976044810ea12e7a4c2b9462b33ce36c36716a2029b171dd3f4151d1852320d3b08f21bf5e86f694f85d77ccd71bbef679764dfa393516f6e0e0bfa32",
152+
"digest": "sha512:189d893405170a3edc624a6b822a8a394a2f8b623c23aed9e015d4b018b232307408b6038322719155fc7da7e9c04a9bb0a76c8521f49dd86a5f84ea3880acb6",
153+
"sourceDigest": "sha512:33f06d7e2bb232ce413d8cf7234bdb416c3a6770dcf18a5c17e3889887b287378ff5fc531758143383c3f50b56613e5bf802b5c49a2a09b748c804568e0565b8",
154154
"maven": {
155155
"groupId": "org.jline",
156156
"artifactId": "jline-builtins",
157-
"version": "3.23.0",
157+
"version": "3.28.0",
158158
},
159159
},
160160
"LLVM_ORG" : {
@@ -658,6 +658,12 @@ class UniversalDetector {
658658
"JLineNativeLoader.initialize\\(\\);": "",
659659
"return JLineLibrary.newFileDescriptor\\(fd\\);": "throw new RuntimeException(\"not implemented\");",
660660
},
661+
"org/jline/terminal/impl/exec/ExecTerminalProvider.java": {
662+
"import org.graalvm.shadowed.org.jline.nativ.JLineLibrary;": "",
663+
"import org.graalvm.shadowed.org.jline.nativ.JLineNativeLoader;": "",
664+
"JLineNativeLoader.initialize\\(\\);": "",
665+
"return JLineLibrary.newRedirectPipe\\(fd\\);": "throw new RuntimeException(\"not implemented\");",
666+
},
661667
# Hard-coded list of terminal providers replaces a generic reflection based mechanism that
662668
# looks up the provider class names in the resources
663669
"org/jline/terminal/spi/TerminalProvider.java": {

vm/mx.vm/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"name": "truffleruby",
52-
"version": "b709cfb128059a7fe88dfce6d292fa7de243b6ac",
52+
"version": "85b1c413f63e92f2af90edad6c38fb78700c8f18",
5353
"dynamic": True,
5454
"urls": [
5555
{"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

vm/tests/all/agentscript/agent-nodeboot.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
< console.log("World");
3333
> cd ${TMP_DIR}
3434
>[6] node --no-extra-info-on-fatal-exception --insight=agent.js script.js
35-
.*agent.js:3
35+
.*agent.js:2
3636
console.log("Hello");
3737
^
3838

0 commit comments

Comments
 (0)