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

8232225: Rework the fix for JDK-8071483 #346

Closed
wants to merge 1 commit into from
Closed

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Jul 25, 2023

This patch prevents possible name clashes for future backports. Right now the jdk8u-dev has the "Color" folder while the jdk11+ use the "color" folder. So depending on what file system backport is done the resulting folder could be different.

This is a proposal to backport the patch which had split the "Color" folder into "color" and "ColorClass". The patch is mostly clean except:

  • AlphaColorTest and XRenderTranslucentColorDrawTest are not present in JDK 8, both related fixes caused a couple of regressions, so no plans to backport it.
  • GetInstanceBrokenStream is added to the patch. In the upstream it was pushed after this fix, now we should place it in the correct folder "color" instead of "Color"

commit in openjdk/jdk

All tests green.


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

Issue

  • JDK-8232225: Rework the fix for JDK-8071483 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 346

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 25, 2023

👋 Welcome back serb! 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.

@mrserb mrserb changed the title 8232225: Rework the fix for JDK-8071483 Backport e4b73897adf47467461634ceb786540f46aa9eb7 Jul 25, 2023
@openjdk openjdk bot changed the title Backport e4b73897adf47467461634ceb786540f46aa9eb7 8232225: Rework the fix for JDK-8071483 Jul 25, 2023
@openjdk
Copy link

openjdk bot commented Jul 25, 2023

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

@openjdk openjdk bot added the backport label Jul 25, 2023
@mrserb mrserb marked this pull request as ready for review July 25, 2023 02:15
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 25, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 25, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jul 26, 2023

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

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

8232225: Rework the fix for JDK-8071483

Reviewed-by: phh

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 added the ready Pull request is ready to be integrated label Jul 26, 2023
@phohensee
Copy link
Member

MacOS-x84 java/math/BigInteger/LargeValueExceptions.java presubmit test failure is unrelated.

@mrserb
Copy link
Member Author

mrserb commented Aug 9, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Aug 9, 2023

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

  • 710481f: 8219804: java/net/MulticastSocket/Promiscuous.java fails intermittently due to NumberFormatException
  • 893340a: 8040887: [TESTBUG] Remove test/runtime/6925573/SortMethodsTest.java
  • a039c8a: 8214046: [macosx] Undecorated Frame does not Iconify when set to

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 9, 2023

@mrserb Pushed as commit ab2d427.

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

@mrserb mrserb deleted the color branch August 9, 2023 16:48
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
2 participants