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

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder #319

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 9, 2021

Almost clean backport of JDK-8247403. Rejected hunks:

  • UITesting.java: integrated import change manually due to unrelated context difference
  • JShellTool.java: integrated one hunk manually due to unrelated context difference
  • ConsoleIOContext.java: integrated Copyright year change and one hunk manually due to unrelated context difference
  • IndentUITest.java doesn't exist in 11u. Skipped.

Progress

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

Issue

  • JDK-8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 319

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 9, 2021

👋 Welcome back mdoerr! 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 2c8e94f6804fee269a882a3e92b7ce844451eb11 8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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 Sep 9, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 9, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

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

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder

Reviewed-by: clanger

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 3 new commits pushed to the master branch:

  • 8da3a00: 8251930: AArch64: Native types mismatch in hotspot
  • cf95c4c: 8206085: Refactor langtools/tools/javac/versions/Versions.java
  • ae0d088: 8270317: Large Allocation in CipherSuite

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 Sep 9, 2021
@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review and the approval!
/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2021

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

  • 4ea2edd: 8260690: JConsole User Guide Link from the Help menu is not accessible by keyboard
  • a39375e: 8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font
  • a013fe2: 8210395: Add doc to SecurityTools.java
  • 8da3a00: 8251930: AArch64: Native types mismatch in hotspot
  • cf95c4c: 8206085: Refactor langtools/tools/javac/versions/Versions.java
  • ae0d088: 8270317: Large Allocation in CipherSuite

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 10, 2021
@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 10, 2021
@TheRealMDoerr TheRealMDoerr deleted the 8247403_JShell branch Sep 10, 2021
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 10, 2021
@openjdk
Copy link

openjdk bot commented Sep 10, 2021

@TheRealMDoerr Pushed as commit 1e6682a.

💡 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 integrated Pull request has been integrated
2 participants