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 #5655

Closed
wants to merge 4 commits into from
Closed

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Sep 23, 2021

I'd like to upgrade the internal JLine to 3.20.0, to support the rxvt terminal (see JDK-8270943), and to generally use a newer version of the library. This patch is basically a application of relevant parts of the diff between JLine 3.14.0 and 3.20.0, with merge fixes as needed.

Thanks!


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5655/head:pull/5655
$ git checkout pull/5655

Update a local copy of the PR:
$ git checkout pull/5655
$ git pull https://git.openjdk.java.net/jdk pull/5655/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5655

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5655.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 23, 2021

👋 Welcome back jlahoda! 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
Copy link

@openjdk openjdk bot commented Sep 23, 2021

@lahodaj The following labels will be automatically applied to this pull request:

  • core-libs
  • kulla

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs kulla labels Sep 23, 2021
@openjdk openjdk bot added the rfr label Sep 23, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 23, 2021

Webrevs

Copy link
Member

@sundararajana sundararajana left a comment

LGTM

/**
*
* @param candidates list of candidates
* @return a map of candidates that completion matcher matches
Copy link
Member

@sundararajana sundararajana Oct 12, 2021

Choose a reason for hiding this comment

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

a list of ..?

Copy link
Contributor Author

@lahodaj lahodaj Oct 12, 2021

Choose a reason for hiding this comment

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

Thanks, I've filled:
jline/jline3#711

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2002-2016, the original author or authors.
* Copyright (c) 2002-2020, the original author or authors.
Copy link
Member

@sundararajana sundararajana Oct 12, 2021

Choose a reason for hiding this comment

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

2021

@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@lahodaj 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

Reviewed-by: sundar

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

  • 1e30695: 8274466: G1: use field directly rather than method in G1CollectorState::in_mixed_phase
  • dd93c6e: 8272167: AbsPathsInImage.java should skip *.dSYM directories
  • 829dea4: 8274945: Cleanup unnecessary calls to Throwable.initCause() in java.desktop
  • 75f5145: 8274925: Shenandoah: shenandoah/TestAllocHumongousFragment.java test failed on lock rank check
  • 83c3771: 8273881: Metaspace: test repeated deallocations
  • 3f01d03: 8275021: Test serviceability/sa/TestJmapCore.java fails with: java.io.IOException: Stack frame 0x4 not found
  • 3f07337: 8273614: Shenandoah: intermittent timeout with ConcurrentGCBreakpoint tests
  • 0d80f6c: 8274379: Allow process of unsafe access errors in check_special_condition_for_native_trans
  • b870468: 8274347: Passing a nested switch expression as a parameter causes an NPE during compile
  • 110e38d: 8274753: ZGC: SEGV in MetaspaceShared::link_shared_classes
  • ... and 701 more: https://git.openjdk.java.net/jdk/compare/a86ac0d1e3a6f02e587362c767abdf62b308d321...master

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 label Oct 12, 2021
@lahodaj
Copy link
Contributor Author

@lahodaj lahodaj commented Oct 13, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

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

  • dcf428c: 8275075: Remove unnecessary conversion to String in jdk.hotspot.agent
  • c3b75c6: 8274516: [REDO] JDK-8271880: Tighten condition for excluding regions from collecting cards with cross-references
  • 337b73a: 8274851: [PPC64] Port zgc to linux on ppc64le
  • cf82867: 8275049: [ZGC] missing null check in ZNMethod::log_register
  • ab34cce: 8275186: Suppress warnings on non-serializable array component types in xml
  • b1b8350: 8275171: ProblemList compiler/codegen/aes/TestAESMain.java on linux-x64 and windows-x64 in -Xcomp mode
  • 03c2b73: 8275128: Build hsdis using normal build system
  • 124f823: 8268764: Use Long.hashCode() instead of int-cast where applicable
  • 8657f77: 8271514: support JFR use of new ThreadsList::Iterator
  • b8bd259: 8271737: Only normalize the cached user.dir property once
  • ... and 725 more: https://git.openjdk.java.net/jdk/compare/a86ac0d1e3a6f02e587362c767abdf62b308d321...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 13, 2021

@lahodaj Pushed as commit b8cb76a.

💡 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
core-libs integrated kulla
2 participants