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

8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows #1609

Closed
wants to merge 1 commit into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Dec 23, 2022

Not clean backport, because the problem list bug JDK-8298274 won't get backported. Omitted the ProblemList.txt hunk. Instead I propose to backport the fix (this PR) instead. Follow up for #1608 in order to fix the test on Windows.

Please review this test-only backport. Thanks!

Test passes with the fix of openjdk/jdk11u#65 included.


Progress

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

Issue

  • JDK-8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1609

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 23, 2022

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/1608 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 cf93933e21d146fe296b1e4b8e2ef06b699175d6 8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows Dec 23, 2022
@openjdk
Copy link

openjdk bot commented Dec 23, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 23, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 23, 2022

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented Jan 10, 2023

This is now a clean backport as compared to the JDK 17u backport:
openjdk/jdk17u-dev@c370dec

I think for this trivial (test-only) patch it should be fine to mark as clean for that reason.

@jerboaa
Copy link
Contributor Author

jerboaa commented Jan 10, 2023

/clean

@openjdk openjdk bot added the clean label Jan 10, 2023
@openjdk
Copy link

openjdk bot commented Jan 10, 2023

@jerboaa This backport pull request is now marked as clean

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1608 to master January 10, 2023 09:56
@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 jdk-8298271-backport
git fetch https://git.openjdk.org/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 bot commented Jan 10, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Jan 10, 2023

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

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

8298271: java/security/SignedJar/spi-calendar-provider/TestSPISigned.java failing on Windows

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 Jan 10, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Jan 10, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2023

Going to push as commit 9c3f547.

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

openjdk bot commented Jan 10, 2023

@jerboaa Pushed as commit 9c3f547.

💡 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 clean integrated Pull request has been integrated
1 participant