Navigation Menu

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

8297587: Upgrade JLine to 3.22.0 #1974

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 21, 2023

One of the required updates of external libs.
Clean backport from 17.

Includes 8304498.


Progress

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

Issues

  • JDK-8297587: Upgrade JLine to 3.22.0 (Task - P3)
  • JDK-8304498: JShell does not switch to raw mode when there is no /bin/test (Bug - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1974

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

Using diff file

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

Webrev

Link to Webrev Comment

@GoeLin
Copy link
Member Author

GoeLin commented Jun 21, 2023

/issue JDK-8304498

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 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 d5a23099f5c820e0d45fe38578600d197a184b59 8297587: Upgrade JLine to 3.22.0 Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 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 Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

@GoeLin
Adding additional issue to issue list: 8304498: JShell does not switch to raw mode when there is no /bin/test.

@mlbridge
Copy link

mlbridge bot commented Jun 21, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 21, 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.

@openjdk openjdk bot added the clean label Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

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

8297587: Upgrade JLine to 3.22.0
8304498: JShell does not switch to raw mode when there is no /bin/test

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 the ready Pull request is ready to be integrated label Jun 21, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jun 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2023

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

  • e0b98bc: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • e30705e: 8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
  • 30f0493: 8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
  • 114bb9a: 8239537: cgroup MetricsTester testMemorySubsystem fails sometimes when testing memory.kmem.tcp.usage_in_bytes
  • ... and 4 more: https://git.openjdk.org/jdk11u-dev/compare/6e12eba9a9b29635c136984dc24e9d019dc07560...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 25, 2023
@openjdk openjdk bot closed this Jun 25, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 25, 2023
@GoeLin GoeLin deleted the goetz_backport_8297587 branch June 25, 2023 12:24
@openjdk
Copy link

openjdk bot commented Jun 25, 2023

@GoeLin Pushed as commit 4dd85cb.

💡 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 Pull request has been integrated
1 participant