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

8321489: Update LCMS to 2.16 #2294

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 13, 2024

I backport this for parity with 17.0.12-oracle.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8321489 needs maintainer approval

Issue

  • JDK-8321489: Update LCMS to 2.16 (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2294

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 13, 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 openjdk bot changed the title Backport dc7d3b182d226253ca246dd854c85c4dd964f10e 8321489: Update LCMS to 2.16 Mar 13, 2024
@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 13, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 13, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 13, 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:

8321489: Update LCMS to 2.16

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:

  • c9b0307: 8268974: GetJREPath() JLI function fails to locate libjava.so if not standard Java launcher is used
  • 0b20589: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • 27cf2f4: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch

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.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 14, 2024

GHA failure: Risc-V compile setup failed, unrelated.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Mar 14, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 14, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

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

  • dc60887: 8289401: Add dump output to TestRawRSACipher.java
  • 0499df3: 8285452: Add a new test library API to replace a file content using FileUtils.java
  • 4b9ab0d: 8286740: JFR: Active Setting event emitted incorrectly
  • c9b0307: 8268974: GetJREPath() JLI function fails to locate libjava.so if not standard Java launcher is used
  • 0b20589: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • 27cf2f4: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 14, 2024

@GoeLin Pushed as commit 807faa7.

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

Successfully merging this pull request may close these issues.

1 participant