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

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

ktakakuri
Copy link
Contributor

@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 - Requested)

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

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@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 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
Contributor 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 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
Contributor 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
Contributor 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
Contributor Author

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 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
Contributor Author

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 27, 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
Contributor Author

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

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/517 to master December 3, 2024 00:10
@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 8274606
git fetch https://git.openjdk.org/jdk8u-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 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
Contributor Author

I resolved the conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval backport rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

2 participants