Skip to content

Conversation

@TimPushkin
Copy link
Contributor

@TimPushkin TimPushkin commented Aug 28, 2025

Backport of JDK-8274893 from JDK 17, for parity with Oracle 11.0.27.

The only conflict was trivial: in imports of JEditorPane which uses * imports in this release, so no change was needed.

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
  • JDK-8274893 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8274893: Update java.desktop classes to use try-with-resources (Enhancement - P5 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3082

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/3082.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 pr/3081 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:

8274893: Update java.desktop classes to use try-with-resources

Reviewed-by: abakhtin

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:

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) 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 changed the title Backport 70c6df6be431fe11c5441986ed04040f9ec3b750 8274893: Update java.desktop classes to use try-with-resources 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 backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 28, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 28, 2025

Webrevs

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

@TimPushkin
Copy link
Contributor Author

/approval request Backporting for parity with Oracle and to make a dependent in-progress backport cleaner.
Low 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. There was a single trivial conflict (imports).
Testing: GitHub CI, jdk_imageio test group locally (mac/arm64).

@openjdk
Copy link

openjdk bot commented Aug 29, 2025

@TimPushkin
8274893: 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
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/3081 to master September 23, 2025 15:37
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8274893-jdk11
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@jerboaa
Copy link
Contributor

jerboaa commented Sep 24, 2025

@TimPushkin Please fix the merge conflict and merge master. Thanks!

@sercher
Copy link

sercher commented Oct 3, 2025

Hi @TimPushkin
It looks to me 8274893 hasn't been ported to Oracle's 11.0.27.
The descroption is therefore incorrect.

@TimPushkin
Copy link
Contributor Author

@sercher Hi, the description is based on JDK-8348382 — a backport of JDK-8274893 with fix version 11.0.27-oracle

@sercher
Copy link

sercher commented Oct 3, 2025

@TimPushkin Ouch, you are correct. Apologies, I was looking at the wrong issue.

@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 Oct 21, 2025
@TimPushkin
Copy link
Contributor Author

/integrate

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

openjdk bot commented Oct 21, 2025

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

@alexeybakhtin
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 21, 2025

Going to push as commit fd23a93.
Since your change was applied there have been 4 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 Oct 21, 2025
@openjdk openjdk bot closed this Oct 21, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 21, 2025
@openjdk
Copy link

openjdk bot commented Oct 21, 2025

@alexeybakhtin @TimPushkin Pushed as commit fd23a93.

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

5 participants