Skip to content

Conversation

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Feb 6, 2025

Hi all,

This pull request contains a backport of commit e1967d51 from the openjdk/jdk21u-dev repository.
The commit being backported was authored by Christoph Langer on 31 Jan 2025 and was reviewed by Severin Gehwolf.

The patch is clean, but in 17 there is no FreeTypeScalerJNICheck.java so the bots don't recognize this.

Thanks!


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-8348625 needs maintainer approval

Issue

  • JDK-8348625: [21u, 17u] Revert JDK-8185862 to restore old java.awt.headless behavior on Windows (Bug - P2 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3270

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 6, 2025

👋 Welcome back clanger! 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 Feb 6, 2025

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

8348625: [21u, 17u] Revert JDK-8185862 to restore old java.awt.headless behavior on Windows

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

  • 2691c14: 8345368: java/io/File/createTempFile/SpecialTempFile.java fails on Windows Server 2025
  • f63ee83: 8346671: java/nio/file/Files/probeContentType/Basic.java fails on Windows 2025
  • 087e8a2: 8342988: GHA: Build JTReg in single step
  • 7213c0d: 8340411: open source several 2D imaging tests
  • 751130a: 8345468: test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java fails in ubuntu22.04
  • 50c6fab: 8330702: Update failure handler to don't generate Error message if cores actions are empty
  • cf4fca2: 8266435: WBMPImageReader.read() should not truncate the input stream

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 e1967d5124309de5276ab88d1bcf4d24f2620dab 8348625: [21u, 17u] Revert JDK-8185862 to restore old java.awt.headless behavior on Windows Feb 6, 2025
@openjdk
Copy link

openjdk bot commented Feb 6, 2025

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Feb 6, 2025
@mlbridge
Copy link

mlbridge bot commented Feb 6, 2025

Webrevs

@openjdk
Copy link

openjdk bot commented Feb 11, 2025

⚠️ @RealCLanger 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 approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Feb 11, 2025
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 12, 2025

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

  • 2691c14: 8345368: java/io/File/createTempFile/SpecialTempFile.java fails on Windows Server 2025
  • f63ee83: 8346671: java/nio/file/Files/probeContentType/Basic.java fails on Windows 2025
  • 087e8a2: 8342988: GHA: Build JTReg in single step
  • 7213c0d: 8340411: open source several 2D imaging tests
  • 751130a: 8345468: test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java fails in ubuntu22.04
  • 50c6fab: 8330702: Update failure handler to don't generate Error message if cores actions are empty
  • cf4fca2: 8266435: WBMPImageReader.read() should not truncate the input stream

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 12, 2025

@RealCLanger Pushed as commit 4e51764.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@RealCLanger RealCLanger deleted the backport-RealCLanger-e1967d51-master branch February 12, 2025 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants