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 #1907

Closed
wants to merge 3 commits into from

Conversation

Nagata-Haruhito
Copy link
Contributor

@Nagata-Haruhito Nagata-Haruhito commented May 29, 2023

I want to backport JDK-8268457 to JDK11u.
This is almost clean except lastmodified month.

Note, included test is broken, it was fixed with JDK-8274606,
I intend to follow up with its backport same as jdk17u.


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

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1907

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

Using diff file

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

Webrev

Link to Webrev Comment

Sorry, something went wrong.

Nagata, Haruhito and others added 3 commits May 26, 2023 19:20

Verified

This commit was signed with the committer’s verified signature.
pendo324 Justin

Verified

This commit was signed with the committer’s verified signature.
pendo324 Justin
@bridgekeeper
Copy link

bridgekeeper bot commented May 29, 2023

👋 Welcome back Nagata-Haruhito! 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.

@Nagata-Haruhito Nagata-Haruhito changed the title backport 83bce94 backport 83bce94cc8a7fb45b0604598411fbecc62000dfd May 29, 2023
@Nagata-Haruhito Nagata-Haruhito changed the title backport 83bce94cc8a7fb45b0604598411fbecc62000dfd Backport 83bce94cc8a7fb45b0604598411fbecc62000dfd May 29, 2023
@openjdk openjdk bot changed the title Backport 83bce94cc8a7fb45b0604598411fbecc62000dfd 8268457: XML Transformer outputs Unicode supplementary character incorrectly to HTML May 29, 2023
@openjdk
Copy link

openjdk bot commented May 29, 2023

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 May 29, 2023
@mlbridge
Copy link

mlbridge bot commented May 29, 2023

Webrevs

@Nagata-Haruhito
Copy link
Contributor Author

Would you please review this PR?

@GoeLin
Copy link
Member

GoeLin commented Jun 2, 2023

Please, first review, then label fix-request.
Also, prepare a dependent PR for the test fix on top of this one.
I will only approve both at a time.

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.

Lgtm.

@openjdk
Copy link

openjdk bot commented Jun 5, 2023

@Nagata-Haruhito 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

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

  • 26652c8: 8308156: VerifyCACerts.java misses blank in error output
  • c1b7fd2: 8223714: HTTPSetAuthenticatorTest could be made more resilient
  • 9fe6ade: 8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
  • 0fdd6dd: 8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
  • d0252df: 8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
  • 7c6beb1: 8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
  • 31fb083: 8217395: Update langtools shell tests to use ${EXE_SUFFIX}
  • b11aa05: 8211343: nsk_jvmti_parseoptions should handle multiple suboptions
  • db37a67: Merge
  • 0770b1f: 8309476: [11u] tools/jmod/hashes/HashesOrderTest.java fails intermittently
  • ... and 21 more: https://git.openjdk.org/jdk11u-dev/compare/8a0b64bf08419204a333d92d09e16e0082d25958...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 5, 2023
@Nagata-Haruhito
Copy link
Contributor Author

Thank you for your advice.
I create new PR for my PR branch.
Is it OK for "a dependent PR for the test fix on top of this one" ?

@Nagata-Haruhito
Copy link
Contributor Author

Should I re-label "11u-fix-request" on JBS ? Or can I type /integrate now ?

@phohensee
Copy link
Member

The jdk11u-fix-request label is on the JBS issue, but no jdk11u-fix-yes, so we're still waiting for the maintainer decision before adding /integrate.

@Nagata-Haruhito
Copy link
Contributor Author

I have confirmed jdk11u-fix-yes label is added on JBS. Thank you very match.

@Nagata-Haruhito
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@Nagata-Haruhito
Your change (at version e8577c3) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/integrate

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@phohensee Only the author (@Nagata-Haruhito) is allowed to issue the integrate command. As this pull request is ready to be sponsored, and you are an eligible sponsor, did you mean to issue the /sponsor command?

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

  • c1bb926: 8309138: Fix container tests for jdks with symlinked conf dir
  • 3bc72d0: 8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
  • 26652c8: 8308156: VerifyCACerts.java misses blank in error output
  • c1b7fd2: 8223714: HTTPSetAuthenticatorTest could be made more resilient
  • 9fe6ade: 8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
  • 0fdd6dd: 8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
  • d0252df: 8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
  • 7c6beb1: 8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
  • 31fb083: 8217395: Update langtools shell tests to use ${EXE_SUFFIX}
  • b11aa05: 8211343: nsk_jvmti_parseoptions should handle multiple suboptions
  • ... and 23 more: https://git.openjdk.org/jdk11u-dev/compare/8a0b64bf08419204a333d92d09e16e0082d25958...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 14, 2023
@openjdk openjdk bot closed this Jun 14, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@phohensee @Nagata-Haruhito Pushed as commit ad283ae.

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

@gnu-andrew
Copy link
Member

Is there a reason that SurrogateTest.java in this change has a different copyright year (2023) to the version in 17u and 18 (2021)?

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.

None yet

4 participants