Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented May 29, 2023

Simple resolves. Either Copyright, or because "8229999: Apply java.io.Serial annotations to security types in java.base" is not in 11.


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-8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1909

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 29, 2023

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/1908 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 56b79604966ba6670e0370467405c71f474bfd72 8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException May 29, 2023
@openjdk
Copy link

openjdk bot commented May 29, 2023

This backport pull request has now been updated with issue and summary 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 May 29, 2023
@mlbridge
Copy link

mlbridge bot commented May 29, 2023

Webrevs

@GoeLin GoeLin force-pushed the goetz_backport_8242897 branch from e98ba13 to ea3ab18 Compare May 29, 2023 13:46
@openjdk
Copy link

openjdk bot commented May 29, 2023

@GoeLin 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.

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1908 to master June 14, 2023 08:57
@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_8242897
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

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@GoeLin this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout goetz_backport_8242897
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

⚠️ @GoeLin This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

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

8242897: KeyFactory.generatePublic( x509Spec ) failed with java.security.InvalidKeyException

Changed SunRsaSign provider to accept RSA signature oid in RSA key encoding for backward compatibility

Reviewed-by: mbaesken

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 ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jun 14, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jun 15, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 15, 2023

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

  • ad283ae: 8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML
  • c1bb926: 8309138: Fix container tests for jdks with symlinked conf dir

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 15, 2023

@GoeLin Pushed as commit d7701cd.

💡 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_8242897 branch June 15, 2023 09:03
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.

2 participants