Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 17, 2025

I backport this for parity with 21.0.7-oracle.


Progress

  • JDK-8341412 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8341412: Various test failures after JDK-8334305 (Bug - P1 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1335

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 17, 2025

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/1334 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 Jan 17, 2025

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8341412: Various test failures after JDK-8334305

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 changed the title Backport 49501fe9c4d0fc4d6285ba4f5d403754e5a147bd 8341412: Various test failures after JDK-8334305 Jan 17, 2025
@openjdk
Copy link

openjdk bot commented Jan 17, 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 clean Identical backport; no merge resolution required rfr Pull request is ready for review labels Jan 17, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 17, 2025

Webrevs

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

You could have done this inline in the backport of JDK-8334305.

@openjdk openjdk bot removed the approval Requires approval; will be removed when approval is received label Jan 18, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Jan 18, 2025

That's true, but this way both are clean.
In 17 I'll need reviews anyways, there I will merge them.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1334 to master January 20, 2025 09:00
@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 goetz_backport_8341412
git fetch https://git.openjdk.org/jdk21u-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

@openjdk openjdk bot removed the clean Identical backport; no merge resolution required label Jan 20, 2025
@openjdk openjdk bot added clean Identical backport; no merge resolution required ready Pull request is ready to be integrated labels Jan 20, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Jan 20, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 20, 2025

Going to push as commit 920f02b.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 99a9299: 8311546: Certificate name constraints improperly validated with leading period

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 20, 2025

@GoeLin Pushed as commit 920f02b.

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

@GoeLin GoeLin deleted the goetz_backport_8341412 branch January 20, 2025 09:08
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 clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants