Skip to content

8297587: Upgrade JLine to 3.22.0 #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented May 8, 2023

I backport this as one of the regular updates to external libs.

Some cleanups were applied to the jline sources in head:
8276641: Use blessed modifier order in jshell
8284209: Replace remaining usages of 'a the' in source code
These were not backported, but overwritten by the jline update:
It obviously resets such changes to the wording in the
upstream sources.
src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
src/jdk.internal.le/windows/classes/jdk/internal/org/jline/terminal/impl/jna/win/WindowsAnsiWriter.java

src/jdk.internal.le/share/classes/module-info.java
Resolved due to context.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1331/head:pull/1331
$ git checkout pull/1331

Update a local copy of the PR:
$ git checkout pull/1331
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1331/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1331

View PR using the GUI difftool:
$ git pr show -t 1331

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1331.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2023

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 4619e8bae838abd1f243c2c65a538806d226b8e8 8297587: Upgrade JLine to 3.22.0 May 8, 2023
@openjdk
Copy link

openjdk bot commented May 8, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 8, 2023
@mlbridge
Copy link

mlbridge bot commented May 8, 2023

Webrevs

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In jdk20u openjdk/jdk20u@6db9050

I see

src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/OSUtils.java

    private static boolean isTestCommandValid(String command) {
        return Files.isExecutable(Paths.get(command));
    }

where is this here ? is it not needed ?
Otherwise looks okay to me.

@GoeLin
Copy link
Member Author

GoeLin commented May 9, 2023

Hi Matthias,
the patch in 20u contains follow-up JDK-8304498 which brings this new method.
Maybe I should include that here, too. Makes the change more similar to the 20u one
and simplifies backporting to 11.

1 similar comment
@GoeLin
Copy link
Member Author

GoeLin commented May 9, 2023

Hi Matthias,
the patch in 20u contains follow-up JDK-8304498 which brings this new method.
Maybe I should include that here, too. Makes the change more similar to the 20u one
and simplifies backporting to 11.

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for explaining the difference to jdk20u .

@openjdk
Copy link

openjdk bot commented May 9, 2023

@GoeLin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8297587: Upgrade JLine to 3.22.0

Reviewed-by: mbaesken

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 6a84974: 8305690: [X86] Do not emit two REX prefixes in Assembler::prefix

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 9, 2023
@GoeLin
Copy link
Member Author

GoeLin commented May 10, 2023

Somehow the test hang. SAP nightly testing passed.

@GoeLin GoeLin force-pushed the goetz_backport_8297587 branch from 38b98c6 to de19bbc Compare May 10, 2023 06:08
@openjdk
Copy link

openjdk bot commented May 10, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@GoeLin
Copy link
Member Author

GoeLin commented May 11, 2023

/integrate

@openjdk
Copy link

openjdk bot commented May 11, 2023

Going to push as commit d5a2309.
Since your change was applied there have been 6 commits pushed to the master branch:

  • 8656141: 8301216: ForkJoinPool invokeAll() ignores timeout
  • 3f52961: 8296934: Write a test to verify whether Undecorated Frame can be iconified or not
  • efa1786: 8292206: TestCgroupMetrics.java fails as getMemoryUsage() is lower than expected
  • d4467a7: 8307331: Correctly update line maps when class redefine rewrites bytecodes
  • b9eca2d: 8305993: Add handleSocketErrorWithMessage to extend nio Net.c exception message
  • 6a84974: 8305690: [X86] Do not emit two REX prefixes in Assembler::prefix

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 11, 2023
@openjdk openjdk bot closed this May 11, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 11, 2023
@openjdk
Copy link

openjdk bot commented May 11, 2023

@GoeLin Pushed as commit d5a2309.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin GoeLin deleted the goetz_backport_8297587 branch May 11, 2023 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants