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

8305972: Update XML Security for Java to 3.0.2 #2116

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 9, 2024

I backport this for parity with 17.0.11-oracle.

This is a minimal version that only removes the strings from the interface, as well as the comment. Removing these is explicitly stated in the CSR.

The change keeps the EdDSA implementation. As I understand, 17 supports EdDSA in general, it was just not included for XML when 17 was released.
https://bugs.openjdk.org/browse/JDK-8305972


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8305972 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8305972: Update XML Security for Java to 3.0.2 (Enhancement - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2116

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

⚠️ @GoeLin could not find any commit with hash f0aebc8141de5a50c88658a40caa01967a9afc53. Please update the title with the hash for an existing commit.

@openjdk openjdk bot changed the title Backport f0aebc8141de5a50c88658a40caa01967a9afc53 8305972: Update XML Security for Java to 3.0.2 Jan 9, 2024
@openjdk
Copy link

openjdk bot commented Jan 9, 2024

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 Jan 9, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2024

Webrevs

@GoeLin GoeLin force-pushed the goetz_backport_8305972-minimal branch from 3abbcfe to b080939 Compare January 10, 2024 07:41
@openjdk
Copy link

openjdk bot commented Jan 10, 2024

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

@GoeLin
Copy link
Member Author

GoeLin commented Jan 10, 2024

GHA failures look unrelated, but strange.
javadoc/testJavadocTester/TestRunTests.java does not compile
testJavadocTester/TestRunTests.java:122: error: no suitable method found for runTests(Function<Method,Object[]>,String,String,String)
g.runTests(f, "m1", "m4", "m2");

@openjdk
Copy link

openjdk bot commented Jan 17, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Jan 17, 2024
@openjdk
Copy link

openjdk bot commented Jan 17, 2024

@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:

8305972: Update XML Security for Java to 3.0.2

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 14 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 approval labels Jan 17, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 17, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 17, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 17, 2024

@GoeLin Pushed as commit f133108.

💡 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_8305972-minimal branch January 17, 2024 21:23
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
Development

Successfully merging this pull request may close these issues.

2 participants