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

8323801: <s> tag doesn't strikethrough the text #660

Closed

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 3, 2024

Backport of JDK-8323801. Clean except Copyright year change.


Progress

  • JDK-8323801 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8323801: <s> tag doesn't strikethrough the text (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 660

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 3, 2024

👋 Welcome back mdoerr! 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 3, 2024

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8323801: <s> tag doesn't strikethrough the text

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

  • cee2443: 8328234: Remove unused nativeUtils files
  • 96249e3: 8328218: Delete test java/awt/Window/FindOwner/FindOwner.html
  • 47f4ea8: 8328561: test java/awt/Robot/ManualInstructions/ManualInstructions.java isn't used
  • 78d39b1: 8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache
  • eee3b42: 8332431: NullPointerException in JTable of SwingSet2
  • 82adc56: 8311989: Test java/lang/Thread/virtual/Reflection.java timed out
  • 481b42f: 8315804: Open source several Swing JTabbedPane JTextArea JTextField tests
  • 53b2836: 8320945: problemlist tests failing on latest Windows 11 update
  • 46c0e1e: 8322008: Exclude some CDS tests from running with -Xshare:off
  • f1c7553: 8310201: Reduce verbose locale output in -XshowSettings launcher option
  • ... and 2 more: https://git.openjdk.org/jdk21u-dev/compare/9c0896c04b1919a27338ae3e37c4b45966054972...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 80b63b67293970936d57ae4375ad76cd2b11a333 8323801: <s> tag doesn't strikethrough the text Jun 3, 2024
@openjdk
Copy link

openjdk bot commented Jun 3, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 3, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 3, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request JDK 21 is affected by this bug. The included test fails without this fix, but passes with it. The actual fix is very small. The rest of the PR is trivial cleanup and the new test. There is no known regression. Tier 1-4 have passed. We will also backport the related issues to 21.0.5.

@openjdk
Copy link

openjdk bot commented Jun 4, 2024

@TheRealMDoerr
8323801: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 4, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 4, 2024

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

  • cee2443: 8328234: Remove unused nativeUtils files
  • 96249e3: 8328218: Delete test java/awt/Window/FindOwner/FindOwner.html
  • 47f4ea8: 8328561: test java/awt/Robot/ManualInstructions/ManualInstructions.java isn't used
  • 78d39b1: 8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache
  • eee3b42: 8332431: NullPointerException in JTable of SwingSet2
  • 82adc56: 8311989: Test java/lang/Thread/virtual/Reflection.java timed out
  • 481b42f: 8315804: Open source several Swing JTabbedPane JTextArea JTextField tests
  • 53b2836: 8320945: problemlist tests failing on latest Windows 11 update
  • 46c0e1e: 8322008: Exclude some CDS tests from running with -Xshare:off
  • f1c7553: 8310201: Reduce verbose locale output in -XshowSettings launcher option
  • ... and 2 more: https://git.openjdk.org/jdk21u-dev/compare/9c0896c04b1919a27338ae3e37c4b45966054972...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 4, 2024

@TheRealMDoerr Pushed as commit ec7a205.

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

@TheRealMDoerr TheRealMDoerr deleted the 8323801_HTML_strikethrough branch June 5, 2024 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant