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

8319124: Update XML Security for Java to 3.0.3 #2139

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 18, 2024

I backport this for parity with 17.0.11-oracle.
I used the 21u commit as base. This makes the backport almost clean, and alredy reflects the adaptions needed because of the backport CSR.

The following trivial resolves were made:

src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRSAPSSSignatureMethod.java
Cannot remove line with logging code because this was already
removed by "8316976: Improve signature handling"

src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java
Resolved imports due to context.


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
  • JDK-8319124 needs maintainer approval
  • Change requires CSR request JDK-8321532 to be approved

Issues

  • JDK-8319124: Update XML Security for Java to 3.0.3 (Enhancement - P3 - Approved)
  • JDK-8321532: Update XML Security for Java to 3.0.3 (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2139

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 18, 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 openjdk bot changed the title Backport 45df078510ad6b8fb336e4180622ca3792bbe0cc 8319124: Update XML Security for Java to 3.0.3 Jan 18, 2024
@openjdk
Copy link

openjdk bot commented Jan 18, 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 18, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 18, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 19, 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 19, 2024
@openjdk
Copy link

openjdk bot commented Jan 19, 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:

8319124: Update XML Security for Java to 3.0.3

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

  • e113ab7: 8317771: [macos14] Expand/collapse a JTree using keyboard freezes the application in macOS 14 Sonoma
  • a632e30: 8323008: filter out harmful -std* flags added by autoconf from CXX

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 19, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 19, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 19, 2024

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

  • e113ab7: 8317771: [macos14] Expand/collapse a JTree using keyboard freezes the application in macOS 14 Sonoma
  • a632e30: 8323008: filter out harmful -std* flags added by autoconf from CXX

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 19, 2024

@GoeLin Pushed as commit 6b5655a.

💡 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_8319124 branch January 19, 2024 15:51
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
2 participants