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

8332545: Fix handling of HTML5 entities in Markdown comments #19317

Conversation

jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented May 20, 2024

Please review a small fix to address a crash when handling HTML5 entities in a Markdown doc comment.

The path for the entities.txt (originally entities.properties) was not correctly imported when importing the latest version of commonmark-java. And, the makefiles need to be updated to include the .txt file in the image. (The interim module for the interim javadoc already had this fix.)

A simple new test is provided, containing entities that previously caused javadoc to crash.


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-8332545: Fix handling of HTML5 entities in Markdown comments (Bug - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/19317/head:pull/19317
$ git checkout pull/19317

Update a local copy of the PR:
$ git checkout pull/19317
$ git pull https://git.openjdk.org/jdk.git pull/19317/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19317

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/19317.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 20, 2024

👋 Welcome back jjg! 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 May 20, 2024

@jonathan-gibbons 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:

8332545: Fix handling of HTML5 entities in Markdown comments

Reviewed-by: prappo, erikj

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 JDK-8332545: Fix handling of HTML5 entities in Markdown comments 8332545: Fix handling of HTML5 entities in Markdown comments May 20, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label May 20, 2024
@openjdk
Copy link

openjdk bot commented May 20, 2024

@jonathan-gibbons The following labels will be automatically applied to this pull request:

  • build
  • javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added javadoc javadoc-dev@openjdk.org build build-dev@openjdk.org labels May 20, 2024
@mlbridge
Copy link

mlbridge bot commented May 20, 2024

Webrevs

Copy link
Member

@pavelrappo pavelrappo left a comment

Choose a reason for hiding this comment

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

Assuming the test fails without the fix, but passes with it, looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 20, 2024
@jonathan-gibbons
Copy link
Contributor Author

Assuming the test fails without the fix, but passes with it, looks good.

Confirmed the test fails without the fix (crash, as reported) and passes with the fix.

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Build change looks good.

@jonathan-gibbons
Copy link
Contributor Author

Build change looks good.

Thank you

@jonathan-gibbons
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 21, 2024

Going to push as commit 6e80512.

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

openjdk bot commented May 21, 2024

@jonathan-gibbons Pushed as commit 6e80512.

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

@jonathan-gibbons jonathan-gibbons deleted the 8332545.html5-entities-markdowns branch May 21, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants