Skip to content

Conversation

@ktakakuri
Copy link
Member

@ktakakuri ktakakuri commented Jun 11, 2024

This is a backport of JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test.
This patch complements JDK-8268457, which I have already proposed for backporting. #517
This backport is not clean due to the fact that the JDK-8268457 backport is not clean.

I confirmed that SurrogateTest.java fails in the build before applying JDK-8268457 and succeeds in the build after applying it.

Testing: All tests under jdk/test/javax/xml/jaxp/

Thank you.


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-8274606 needs maintainer approval

Issue

  • JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 518

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 11, 2024

👋 Welcome back ktakakuri! A progress list of the required criteria for merging this PR into pr/517 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 Jun 11, 2024

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

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

8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test

Reviewed-by: phh

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 59 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 changed the title Backport 7eb0372e55f23275b12470593adc97f1b79bc965 8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test Jun 11, 2024
@openjdk
Copy link

openjdk bot commented Jun 11, 2024

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Jun 11, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 11, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 11, 2024

Webrevs

@phohensee
Copy link
Member

GHA test failures appear unrelated.

@ktakakuri
Copy link
Member Author

/approval request This patch complements JDK-8268457, which I have already proposed for backporting.
There is a low risk because this backport is a test fix only.
I confirmed that SurrogateTest.java fails in the build before applying JDK-8268457 and succeeds in the build after applying it.
Testing: All tests under jdk/test/javax/xml/jaxp/

@openjdk
Copy link

openjdk bot commented Jun 12, 2024

@ktakakuri
8274606: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Jun 12, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 10, 2024

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@ktakakuri
Copy link
Member Author

This pull request is pending approval of the Fix Request.
I comment to not close.

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 2, 2024

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@ktakakuri
Copy link
Member Author

This pull request is pending approval of the Fix Request.
I comment to not close.

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 1, 2024

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@ktakakuri
Copy link
Member Author

This pull request is pending approval of the Fix Request.
I comment to not close.

@openjdk
Copy link

openjdk bot commented Dec 3, 2024

@ktakakuri 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 8274606
git fetch https://git.openjdk.org/jdk8u-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 openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 3, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Dec 4, 2024
@ktakakuri
Copy link
Member Author

I resolved the conflicts.

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 1, 2025

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@ktakakuri
Copy link
Member Author

This pull request is pending approval of the Fix Request.
I comment to not close.

@openjdk openjdk bot removed the approval Requires approval; will be removed when approval is received label Jan 29, 2025
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 3, 2025

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@ktakakuri
Copy link
Member Author

This pull request is pending approval of the Fix Request.
I comment to not close.

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 12, 2025

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 9, 2025

@ktakakuri This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this Apr 9, 2025
@ktakakuri
Copy link
Member Author

/open

@openjdk openjdk bot reopened this May 20, 2025
@openjdk
Copy link

openjdk bot commented May 20, 2025

@ktakakuri This pull request is now open

@ktakakuri
Copy link
Member Author

/open

@openjdk
Copy link

openjdk bot commented May 20, 2025

@ktakakuri This pull request is already open

@ktakakuri
Copy link
Member Author

@phohensee Could you please review again as I resolved the conflict?

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Done.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 20, 2025
@ktakakuri
Copy link
Member Author

Thank you.

@ktakakuri
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented May 21, 2025

Going to push as commit 1daca5f.
Since your change was applied there have been 60 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 May 21, 2025
@openjdk openjdk bot closed this May 21, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 21, 2025
@openjdk
Copy link

openjdk bot commented May 21, 2025

@ktakakuri Pushed as commit 1daca5f.

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

@ktakakuri ktakakuri deleted the 8274606 branch May 21, 2025 08:12
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