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

8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML #517

Closed
wants to merge 8 commits into from

Conversation

ktakakuri
Copy link
Contributor

@ktakakuri ktakakuri commented Jun 11, 2024

Hi all,

JDK8 reproduces the reported bug and I would like to backport this patch.
The patch is not clean.

  • Eliminated the use of test libraries and TestNG, and embedded compareWithGold() method and compareStringWithGold() method.
  • Removed indentation from SurrogateTest1.html because indentation is not added in ToHTMLStream.java in JDK8. This difference is due to JDK-8175793 introduced in JDK9.

There is a related patch JDK-8274606, and I have proposed a separate backport for it. #518

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

Issue

  • JDK-8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 517

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/517.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 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 Jun 11, 2024

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

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

8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML

Reviewed-by: phh, andrew

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

  • e4297a7: 8339882: Replace ThreadLocalStorage::thread with Thread::current_or_null in jdk8 backport of JDK-8183925
  • ed3d731: 8342841: [8u] Separate jdk_security_infra tests from jdk_tier1
  • 1d2f467: 8189687: Swing: Invalid position of candidate pop-up of InputMethod in Hi-DPI on Windows
  • 41f479c: 8133287: (fs) java/nio/file/Files/probeContentType/ParallelProbes.java should use othervm mode
  • 7e1ea51: 8339133: [8u] Profiler crashes at guarantee(is_result_safe || is_in_asgct()): unsafe access to zombie method
  • 31b8804: Merge
  • 618917e: 8341059: Change Entrust TLS distrust date to November 12, 2024
  • 1c1afe3: 8341057: Add 2 SSL.com TLS roots
  • e976b99: 8335713: Enhance vectorization analysis
  • c5508ab: 8332644: Improve graph optimizations
  • ... and 100 more: https://git.openjdk.org/jdk8u-dev/compare/6b53212ef78ad50f9eede829c5ff87cadcdb434b...master

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 83bce94cc8a7fb45b0604598411fbecc62000dfd 8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML 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 backport rfr Pull request is ready for review labels Jun 11, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 11, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 11, 2024

⚠️ @ktakakuri 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.

@phohensee
Copy link
Member

GHA test failures appear infrastructure related.

@ktakakuri
Copy link
Contributor Author

/approval request JDK8 reproduces the reported bug and I would like to backport this patch.
There is a low risk because the logic around the changes is the same as JDK18.
The original patch does not apply cleanly to 8u, but I verified that it works.
There is a related patch JDK-8274606, and I have proposed a separate backport for it.
Testing: All tests under jdk/test/javax/xml/jaxp/

@openjdk
Copy link

openjdk bot commented Jun 12, 2024

@ktakakuri
8268457: 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.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Change looks good to me.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Nov 29, 2024

@gnu-andrew
8268457: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Nov 29, 2024
@ktakakuri
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 3, 2024

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

  • 00d2542: 8326110: [8u] The Marlin tests should be updated after JDK-8241307
  • 9d330da: 8037013: [TESTBUG] Fix test/java/lang/ClassLoader/Assert.sh on AIX
  • e4297a7: 8339882: Replace ThreadLocalStorage::thread with Thread::current_or_null in jdk8 backport of JDK-8183925
  • ed3d731: 8342841: [8u] Separate jdk_security_infra tests from jdk_tier1
  • 1d2f467: 8189687: Swing: Invalid position of candidate pop-up of InputMethod in Hi-DPI on Windows
  • 41f479c: 8133287: (fs) java/nio/file/Files/probeContentType/ParallelProbes.java should use othervm mode
  • 7e1ea51: 8339133: [8u] Profiler crashes at guarantee(is_result_safe || is_in_asgct()): unsafe access to zombie method
  • 31b8804: Merge
  • 618917e: 8341059: Change Entrust TLS distrust date to November 12, 2024
  • 1c1afe3: 8341057: Add 2 SSL.com TLS roots
  • ... and 102 more: https://git.openjdk.org/jdk8u-dev/compare/6b53212ef78ad50f9eede829c5ff87cadcdb434b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 3, 2024

@ktakakuri Pushed as commit 10122b5.

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

@gnu-andrew
Copy link
Member

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.

3 participants