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

8283328: Update libxml2 to 2.9.13 #764

Closed
wants to merge 8 commits into from

Conversation

HimaBinduMeda
Copy link
Contributor

@HimaBinduMeda HimaBinduMeda commented Mar 31, 2022

We currently use libxml2 version 2.9.12. It should be updated to latest stable release, which is version 2.9.13.
The steps to update libxml are documented in UPDATING.txt.
There is compilation issue with the release 2.9.13, as mentioned here: https://gitlab.gnome.org/GNOME/libxml2/-/issues/349.
Updated the code with the changes as per the fix mentioned in above link.

Compiled and verified on Windows, Mac and Linux platforms.
Sanity testing looks fine.


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/764/head:pull/764
$ git checkout pull/764

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 764

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2022

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

@HimaBinduMeda HimaBinduMeda changed the title Libxml update JDK-8283328 : Update libxml2 to 2.9.13 Mar 31, 2022
@HimaBinduMeda HimaBinduMeda changed the title JDK-8283328 : Update libxml2 to 2.9.13 8283328 : Update libxml2 to 2.9.13 Mar 31, 2022
@HimaBinduMeda HimaBinduMeda changed the title 8283328 : Update libxml2 to 2.9.13 8283328: Update libxml2 to 2.9.13 Mar 31, 2022
@kevinrushforth
Copy link
Member

kevinrushforth commented Mar 31, 2022

/reviewers 2

@kevinrushforth
Copy link
Member

kevinrushforth commented Mar 31, 2022

I'll do testing and a sanity check review tomorrow. Here are three meta issues:

  1. As noted in SKARA-1222, your patch introduces a sym-link that is causing jcheck to throw an exception. Given that we do not want any sym-links in the repo anyway, you will need to revert the file in question.
  2. Once the above is fixed, you will note that jcheck reports some whitespace errors.
  3. You need to update the version in libxml2.md.

@kevinrushforth
Copy link
Member

kevinrushforth commented Mar 31, 2022

  1. I see that the following files were deleted as part of this PR. Was this intentional?
D       modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/AUTHORS
D       modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/ChangeLog
D       modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/README

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with 1 of role reviewers, 1 of role authors).

@openjdk openjdk bot added the rfr label Apr 1, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 1, 2022

Webrevs

@johanvos
Copy link
Collaborator

johanvos commented Apr 1, 2022

This looks good. Just for my understanding: this is the 2.9.13-tagged plus the fix for the issue with xmlValidNormalizeString() with --without-valid-build (https://gitlab.gnome.org/GNOME/libxml2/-/commit/d05317cee5eb2bd35269b7706a8850c6c3097de3) ?
I notice there was a followup patch (https://gitlab.gnome.org/GNOME/libxml2/-/commit/b057239b3f65c8dd9d472fc878214ea4b1d852d3) but that doesn't touch files we have, and since builds are compiling for me, it seems that we are all good now.

@HimaBinduMeda
Copy link
Contributor Author

HimaBinduMeda commented Apr 1, 2022

  1. As noted in SKARA-1222, your patch introduces a sym-link that is causing jcheck to throw an exception. Given that we do not want any sym-links in the repo anyway, you will need to revert the file in question.

--- Fixed symlinks issue by reverting the file

  1. Once the above is fixed, you will note that jcheck reports some whitespace errors.

-- Resolved

  1. You need to update the version in libxml2.md.

-- Updated

@HimaBinduMeda
Copy link
Contributor Author

HimaBinduMeda commented Apr 1, 2022

This looks good. Just for my understanding: this is the 2.9.13-tagged plus the fix for the issue with xmlValidNormalizeString() with --without-valid-build (https://gitlab.gnome.org/GNOME/libxml2/-/commit/d05317cee5eb2bd35269b7706a8850c6c3097de3) ?

-- Yes, just this patch is sufficient to resolve compilation error.

I notice there was a followup patch (https://gitlab.gnome.org/GNOME/libxml2/-/commit/b057239b3f65c8dd9d472fc878214ea4b1d852d3) but that doesn't touch files we have, and since builds are compiling for me, it seems that we are all good now.

-- Yes , the followup patch is not needed.

Copy link
Collaborator

@johanvos johanvos left a comment

Looks good and works fine on Mac/Linux/Windows

@HimaBinduMeda
Copy link
Contributor Author

HimaBinduMeda commented Apr 1, 2022

7. I see that the following files were deleted as part of this PR. Was this intentional?

D       modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/AUTHORS
D       modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/ChangeLog
D       modules/javafx.web/src/main/native/Source/ThirdParty/libxml/src/README

-- The above files have been deleted in the release v2.9.13.
Added README.md which contains information regarding Authors,License and libxml project

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good. Tested on all three platforms.

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

8283328: Update libxml2 to 2.9.13

Reviewed-by: jvos, kcr, arapte

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 15 new commits pushed to 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.

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 (@johanvos, @kevinrushforth, @arapte) 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 label Apr 1, 2022
arapte
arapte approved these changes Apr 1, 2022
Copy link
Member

@arapte arapte left a comment

Looks good, tested Mac M1 build and macos sanity check.

@HimaBinduMeda
Copy link
Contributor Author

HimaBinduMeda commented Apr 1, 2022

/integrate

@openjdk openjdk bot added the sponsor label Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@HimaBinduMeda
Your change (at version 92ba9af) is now ready to be sponsored by a Committer.

@arapte
Copy link
Member

arapte commented Apr 1, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Apr 1, 2022
@openjdk openjdk bot closed this Apr 1, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@arapte @HimaBinduMeda Pushed as commit b0f2521.

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

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