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

8339560: Unaddressed comments during code review of JDK-8337664 #1018

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 2, 2024

We already backported "8341059: Change Entrust TLS distrust date to November 12, 2024", which in head came after this change. Unfortunately, 8341059 edited a test file that was moved by this change.

Nevertheless, I could prepare this change with three clean operations:

  • Backout jdk23u version of 8341059
  • Clean patch of 8339560
  • Clean patch of 8341059, head version.

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
  • JDK-8339560 needs maintainer approval

Issue

  • JDK-8339560: Unaddressed comments during code review of JDK-8337664 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1018

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2024

👋 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
Copy link

openjdk bot commented Oct 2, 2024

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

8339560: Unaddressed comments during code review of JDK-8337664

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

  • 5762460: 8340804: doc/building.md update Xcode instructions to note that full install is required
  • e241385: 8340418: GHA: MacOS AArch64 bundles can be removed prematurely
  • c673c52: 8340387: Update OS detection code to recognize Windows Server 2025
  • b1cd88a: 8340657: [PPC64] SA determines wrong unextendedSP

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 changed the title Backport 95d3e9d199600bac0284f9151b99aef152e027ac 8339560: Unaddressed comments during code review of JDK-8337664 Oct 2, 2024
@openjdk
Copy link

openjdk bot commented Oct 2, 2024

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 Oct 2, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Oct 3, 2024

GHA failure:
gc/shenandoah/mxbeans/TestPauseNotifications.java#passive
IllegalStateException: Pauses duration (458) is expected to be not larger than cycles duration (438)

I havn't seen this before, but it's surely unrelated to this change touching only test in another area.

@openjdk openjdk bot added approval and removed approval labels Oct 3, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 7, 2024
@MBaesken
Copy link
Member

MBaesken commented Oct 7, 2024

The GHA gc/shenandoah/mxbeans/TestPauseNotifications.java issue is probably this one
https://bugs.openjdk.org/browse/JDK-8335355

@GoeLin
Copy link
Member Author

GoeLin commented Oct 7, 2024

Thanks for review and the hint to the GHA error!

@GoeLin
Copy link
Member Author

GoeLin commented Oct 7, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Oct 7, 2024

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

  • 5762460: 8340804: doc/building.md update Xcode instructions to note that full install is required
  • e241385: 8340418: GHA: MacOS AArch64 bundles can be removed prematurely
  • c673c52: 8340387: Update OS detection code to recognize Windows Server 2025
  • b1cd88a: 8340657: [PPC64] SA determines wrong unextendedSP

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 7, 2024

@GoeLin Pushed as commit 0755f5c.

💡 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
Development

Successfully merging this pull request may close these issues.

2 participants