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

8269131: Update libxml2 to version 2.9.12 #562

Closed
wants to merge 2 commits into from

Conversation

@arapte
Copy link
Member

@arapte arapte commented Jul 1, 2021

We currently use libxml2 version 2.9.10. It should be updated to latest stable release, which is version 2.9.12.
The steps to update libxml are documented in UPDATING.txt.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/562/head:pull/562
$ git checkout pull/562

Update a local copy of the PR:
$ git checkout pull/562
$ git pull https://git.openjdk.java.net/jfx pull/562/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 562

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/562.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 1, 2021

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

Loading

@openjdk openjdk bot added the rfr label Jul 1, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 1, 2021

Webrevs

Loading

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Jul 1, 2021

/reviewers 2

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

Loading

Copy link
Member

@kevinrushforth kevinrushforth left a comment

The changes look good except for the expansion of tags in Makefile.am (we don't want to expand tabs in Makefiles). I recommend re-copying Makefile.am from the original sources of libxml 2.9.12. I left a couple questions on the new instructions in UPDATING.txt as well.

I did a build / test on all 3 platforms. No issues observed.

Loading

@kevinrushforth kevinrushforth self-requested a review Jul 2, 2021
Copy link
Collaborator

@johanvos johanvos left a comment

confirmed to work on linux, win, mac (x86_64)

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

@arapte 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:

8269131: Update libxml2 to version 2.9.12

Reviewed-by: kcr, jvos

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

  • 47c2ec3: 8187229: Tree/TableCell: cancel event must return correct editing location
  • 0e7cf62: 8185447: The special high-contrast mode of JavaFX Controls in Japanese environment do not work.
  • 6403d67: 8231558: [macos] Platform.exit causes assertion error on macOS 10.15 or later
  • 61aff1c: 8258499: JavaFX: Move src.zip out of the lib directory

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

Loading

@openjdk openjdk bot added the ready label Jul 6, 2021
@arapte
Copy link
Member Author

@arapte arapte commented Jul 6, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

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

  • 47c2ec3: 8187229: Tree/TableCell: cancel event must return correct editing location
  • 0e7cf62: 8185447: The special high-contrast mode of JavaFX Controls in Japanese environment do not work.
  • 6403d67: 8231558: [macos] Platform.exit causes assertion error on macOS 10.15 or later
  • 61aff1c: 8258499: JavaFX: Move src.zip out of the lib directory

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Jul 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

@arapte Pushed as commit 52c076c.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants