RFR: 8327476: Upgrade JLine to 3.25.1 [v4]
Magnus Ihse Bursie
ihse at openjdk.org
Fri Mar 22 11:53:25 UTC 2024
On Wed, 20 Mar 2024 18:55:38 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
>
> Jan Lahoda has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 26 commits:
>
> - Merge branch 'master' into jline-upgrade-3.25.1
> - Merge branch 'master' into jline-upgrade-3.25.1
> - Merge branch 'native-access-modules1' into jline-upgrade-3.25.1
> - Merge remote-tracking branch 'origin/native-access-modules1' into native-access-modules1
> - Apply suggestions from code review
>
> Co-authored-by: ExE Boss <3889017+ExE-Boss at users.noreply.github.com>
> Co-authored-by: Maurizio Cimadamore <54672762+mcimadamore at users.noreply.github.com>
> - Merge branch 'native-access-modules1' into jline-upgrade-3.25.1
> - Reflecting review feedback.
> - Updating copyright headers.
> - Re-enabling the exec provider.
> - Cleanup.
> - ... and 16 more: https://git.openjdk.org/jdk/compare/e5e7cd20...c8097592
src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java line 27:
> 25: import java.util.List;
> 26: import java.util.Optional;
> 27: //import java.util.logging.Level;
Maybe remove?
src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java line 41:
> 39: class CLibrary {
> 40:
> 41: // private static final Logger logger = Logger.getLogger("org.jline");
More commented-out code...
src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/CLibrary.java line 549:
> 547: error = new LinkageError(sb.toString());
> 548: suppressed.forEach(error::addSuppressed);
> 549: // if (logger.isLoggable(Level.FINE)) {
More commented out code
-------------
PR Review Comment: https://git.openjdk.org/jdk/pull/18142#discussion_r1535455104
PR Review Comment: https://git.openjdk.org/jdk/pull/18142#discussion_r1535455382
PR Review Comment: https://git.openjdk.org/jdk/pull/18142#discussion_r1535458026
More information about the build-dev
mailing list