Skip to content
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

8273682: Upgrade Jline to 3.20.0 #76

Closed
wants to merge 1 commit into from

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Jan 10, 2022

Clean backport for parity with Oracle 17.0.3.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/76/head:pull/76
$ git checkout pull/76

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 76

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/76.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 10, 2022

👋 Welcome back zgu! 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 b8cb76ad210cb3e7524c7f5b13cfe57746ac05d4 8273682: Upgrade Jline to 3.20.0 Jan 10, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 10, 2022

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

@openjdk
Copy link

@openjdk openjdk bot commented Jan 10, 2022

@zhengyu123 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:

8273682: Upgrade Jline to 3.20.0

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready rfr labels Jan 10, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 10, 2022

Webrevs

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Jan 11, 2022

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 11, 2022

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

  • d716c2b: 8278758: runtime/BootstrapMethod/BSMCalledTwice.java fails with release VMs after JDK-8262134
  • 6c0f974: 8262134: compiler/uncommontrap/TestDeoptOOM.java failed with "guarantee(false) failed: wrong number of expression stack elements during deopt"
  • 832a570: 8269037: jsig/Testjsig.java doesn't have to be restricted to linux only
  • a9b245b: 8269523: runtime/Safepoint/TestAbortOnVMOperationTimeout.java failed when expecting 'VM operation took too long'
  • e8b4d82: 8244602: Add JTREG_REPEAT_COUNT to repeat execution of a test
  • ab0ade6: 8272398: Update DockerTestUtils.buildJdkDockerImage()

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 11, 2022
@openjdk openjdk bot closed this Jan 11, 2022
@openjdk openjdk bot removed ready rfr labels Jan 11, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 11, 2022

@zhengyu123 Pushed as commit 7f684c3.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant