Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
/ jdk15u-dev Public archive

8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492 #170

Closed
wants to merge 1 commit into from

Conversation

omikhaltsova
Copy link

@omikhaltsova omikhaltsova commented Feb 3, 2022

I'd like to backport JDK-8280373 to jdk15u in order to align after JDK-8270492 the copy
src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
to its origin
src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
All regular tests passed.


Progress

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

Issue

  • JDK-8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk15u-dev pull/170/head:pull/170
$ git checkout pull/170

Update a local copy of the PR:
$ git checkout pull/170
$ git pull https://git.openjdk.java.net/jdk15u-dev pull/170/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 170

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk15u-dev/pull/170.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 3, 2022

👋 Welcome back omikhaltcova! 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 c180070cb59b8e075376ae913c5db9a4ed868303 8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492 Feb 3, 2022
@openjdk
Copy link

openjdk bot commented Feb 3, 2022

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

@openjdk
Copy link

openjdk bot commented Feb 3, 2022

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

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

8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492

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:

  • 7894815: 8253639: Change os::attempt_reserve_memory_at parameter order
  • 2802620: 8251216: Implement MD5 intrinsics on AArch64

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 rfr Pull request is ready for review labels Feb 3, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 3, 2022

Webrevs

@omikhaltsova
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 4, 2022

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

  • 7894815: 8253639: Change os::attempt_reserve_memory_at parameter order
  • 2802620: 8251216: Implement MD5 intrinsics on AArch64

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 4, 2022

@omikhaltsova Pushed as commit 6ea7ef6.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant