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

8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fails on macOS12 #698

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Dec 7, 2021

Clean Backport of JDK-8273366 on top of JDK-8199079.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fails on macOS12

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/698/head:pull/698
$ git checkout pull/698

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 698

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/698.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 7, 2021

👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into pr/697 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 febcc72a549e973de4649503fc686fc520e3b3cd 8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fails on macOS12 Dec 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

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

@openjdk openjdk bot added backport clean rfr labels Dec 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 7, 2021

Webrevs

mrserb
mrserb approved these changes Dec 8, 2021
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/697 to master Dec 9, 2021
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Dec 9, 2021

The dependent pull request 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 8199079_swing_testbug
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

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

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

8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fails on macOS12

Reviewed-by: serb

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 label Dec 9, 2021
@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Dec 9, 2021

I just rebased. Still clean. Thanks for approving!
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

Going to push as commit 8878ffc.

@openjdk openjdk bot closed this Dec 9, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

@TheRealMDoerr Pushed as commit 8878ffc.

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

@TheRealMDoerr TheRealMDoerr deleted the 8273366_swing_testbug branch Dec 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
2 participants