Skip to content

Conversation

TimPushkin
Copy link
Contributor

@TimPushkin TimPushkin commented Aug 28, 2025

Backport of JDK-8271456 from JDK 17, for parity with Oracle 11.0.26.

There were trivial conflicts in copyright years and imports in a few files.

Testing: GitHub CI, jdk_imageio test group locally (mac/arm64)


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

Issue

  • JDK-8271456: Avoid looking up standard charsets in "java.desktop" module (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3081

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 28, 2025

👋 Welcome back tpushkin! 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 Aug 28, 2025

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

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

8271456: Avoid looking up standard charsets in "java.desktop" module

Reviewed-by: abakhtin, sgehwolf

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 8 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@alexeybakhtin, @jerboaa) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 28, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 28, 2025

Webrevs

@TimPushkin TimPushkin changed the title 8271456: Avoid looking up standard charsets in "java.desktop" module Backport 6b55ef3b58ae405c46f440e06b5adb03cec3a500 Aug 28, 2025
@openjdk openjdk bot changed the title Backport 6b55ef3b58ae405c46f440e06b5adb03cec3a500 8271456: Avoid looking up standard charsets in "java.desktop" module Aug 28, 2025
@openjdk
Copy link

openjdk bot commented Aug 28, 2025

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Aug 28, 2025
Copy link
Contributor

@alexeybakhtin alexeybakhtin left a comment

Choose a reason for hiding this comment

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

Looks good to me. Almost clean backport with minimum trivial changes

@openjdk
Copy link

openjdk bot commented Aug 28, 2025

⚠️ @TimPushkin 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.

@TimPushkin
Copy link
Contributor Author

TimPushkin commented Aug 29, 2025

JDI test failures do not seem related to the change: the change only affects jdk.desktop module which is not related to the failing jdk.jdi module. JDK-8336451 reads like it was tracking this issue but is was closed as solved a year ago, there is a bunch of similar issues in JBS, not sure if there is one that tracks this exact issue again already.

#3082, which depends on this PR, passed the CI (i.e. the issue is probably intermittent), while unrelated #3077 has exactly the same issue (i.e. the issue is not related to this particular change).

So I don't think anything in this PR should be fixed.

@TimPushkin
Copy link
Contributor Author

/approval Backporting for parity with Oracle and to make dependent in-progress backports cleaner.
Lower medium risk. The change is a cleanup limited to jdk.desktop, it should not change the behavior. It has been running in newer LTS releases for a while now. Conflicts were trivial (copyright years, imports).
Testing: GitHub CI, jdk_imageio test group locally (mac/arm64).

@openjdk
Copy link

openjdk bot commented Aug 29, 2025

@TimPushkin usage: /approval [<id>] (request|cancel) [<text>]

@TimPushkin
Copy link
Contributor Author

/approval request Backporting for parity with Oracle and to make dependent in-progress backports cleaner.
Lower medium risk. The change is a cleanup limited to jdk.desktop, it should not change the behavior. It has been running in newer LTS releases for a while now. Conflicts were trivial (copyright years, imports).
Testing: GitHub CI, jdk_imageio test group locally (mac/arm64).

@openjdk
Copy link

openjdk bot commented Aug 29, 2025

@TimPushkin
8271456: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Aug 29, 2025
Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

Looks OK.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Sep 22, 2025
@TimPushkin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 23, 2025
@openjdk
Copy link

openjdk bot commented Sep 23, 2025

@TimPushkin
Your change (at version 02e544e) is now ready to be sponsored by a Committer.

@alexeybakhtin
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 23, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 23, 2025

@alexeybakhtin @TimPushkin Pushed as commit 2721380.

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

4 participants