Integrated: 8327476: Upgrade JLine to 3.26.1

Jan Lahoda jlahoda at openjdk.org
Thu May 9 13:57:03 UTC 2024


On Wed, 6 Mar 2024 21:20:50 GMT, Jan Lahoda <jlahoda at openjdk.org> wrote:

> This is a patch that:
> a) upgrades the JLine inside the JDK to 3.25.1
> b) since the new version of JLine has a FFM backend, our custom native backends are removed, and replaced with the FFM backend
> 
> Some changes had to be made to the original JLine in order to fit into the JDK. Most of them were already done for the previous version (repackaging, avoiding non-ASCII characters, commenting out logging, adding ability to modify to wrap the InputStream used by the terminal), and have only been transferred to the new one. The main two new changes are:
> - fixes to the FFM backend, so that it works on Linux and JDK 22. These have been proposed to JLine itself: https://github.com/jline/jline3/pull/945
> - disabling the `NativeFileDescriptorCreator`, as I believe we don't need it, and cannot make it work easily
> 
> There's a full patch between the `src/jdk.internal.le/share/classes/jdk/internal/org` and the merged content of the corresponding sources of these original JLine sub-projects:
> https://github.com/jline/jline3/tree/jline-parent-3.25.1/reader
> https://github.com/jline/jline3/tree/jline-parent-3.25.1/terminal-ffm
> https://github.com/jline/jline3/tree/jline-parent-3.25.1/terminal
> the patch is here:
> https://cr.openjdk.org/~jlahoda/8327476/jline-3.25.1-upgrade.diff
> 
> I've also cleaned the patch a little removing most of the changes for the rename. The result is here:
> https://cr.openjdk.org/~jlahoda/8327476/jline-3.25.1-upgrade-significant.diff

This pull request has now been integrated.

Changeset: aaa90b30
Author:    Jan Lahoda <jlahoda at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/aaa90b3005c85852971203ce6feb88e7091e167b
Stats:     13181 lines in 144 files changed: 5784 ins; 5349 del; 2048 mod

8327476: Upgrade JLine to 3.26.1

Reviewed-by: ihse, vromero

-------------

PR: https://git.openjdk.org/jdk/pull/18142


More information about the build-dev mailing list