- Notifications
You must be signed in to change notification settings - Fork 238
8272180: Upgrade JSZip from v3.6.0 to v3.7.1 #407
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
Conversation
👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into |
I've rebase this PR on top of master since #439 was merged. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
After integrating, please add to "8272828 Add correct licenses to jszip.md"
a link "backport" to the issue created during the integration. Then that one is marked as backportet, too.
@jmtd This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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 25 new commits pushed to the
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 (@GoeLin) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
@GoeLin wrote:
Thank you! I've flagged https://bugs.openjdk.java.net/browse/JDK-8272180 "jdk11u-fix-request" and I would normally await
If I understand you correctly, once I issue integrate, the bots will raise a separate JBS bug, and it's that I should add as a Backport link to the original JBS bug? Since this PR also resolves JDK-8272828 , I have to figure out how that can be indicated too. For jdk8u in this situation I've written an "RFA" mail to the dev list. Would that suffice do you think? Thanks! |
@jmtd there's a more elegant way to accomplish that: just comment "/issue JDK-8272828" as per https://wiki.openjdk.java.net/display/SKARA/Pull+Request+Commands#PullRequestCommands-/issue. Then, when you integrate this one, both backports will be resolved. |
/issue JDK-8272828 |
@jmtd |
/integrate |
/sponsor |
Going to push as commit b367f67.
Your commit was automatically rebased without conflicts. |
@RealCLanger@jmtd Pushed as commit b367f67. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This is an implementation of the fix described in JDK-8272180, which was backported to 11.0.13-oracle but which does not have a public patch.
I took jszip 3.7.1 from GitHub. The archive I downloaded was from https://github.com/Stuk/jszip/archive/refs/tags/v3.7.1.tar.gz and I calculate the sha1 sum to be
c5ba7227f1db44a2bd8e30e0cf7edbaf53ef4387
(note: calculated locally, I haven't yet convinced GitHub to show me a checksum for that archive that I can compare).jszip.js
andjszip.min.js
are straight copies of the corresponding files from the pathdist/
in the jszip archive.src/jdk.javadoc/share/legal/jszip.md
is a copy ofjszip-3.7.1/LICENSE.markdown
with the following modifications:Note that this update to
jszip.md
also resolves JDK-8272828 (Add correct licenses to jszip.md) for which there is also no public patch. There is no clear description of what the problem was with the license before, but jszip is dual licensed MIT and GPL3, and prior to this, the 11u copy of the license only included MIT. I've preserved both licenses in this patch.Initial testing: in a pet project (https://github.com/jmtd/wadc), I ran javadoc and inspected the output. Javadoc command:
Prior to patch: jszip 3.2.1 is bundled
After patch: jszip 3.7.1 is bundled
I also checked that the functionality jszip supports (client-side searching for keywords) was working. I got the same results before and after patch: immediate keyword suggestion/completion as I typed into the search box. Attempting to follow any of the links resulted in a broken link for me, however, with an additional "undefined/" included in the URI (file:///home/jon/git/doom/wadc.tmp2/undefined/org/redmars/wadc/EngineConfigDialog.html). I don't know the cause of this yet, so I can't attribute it to a problem in jszip (and if there is one, it's there already.)
I await GHA tier1 testing after raising this PR. I'll also check now which other javadoc-related tests are worth trying.
Progress
Issues
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/407/head:pull/407
$ git checkout pull/407
Update a local copy of the PR:
$ git checkout pull/407
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/407/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 407
View PR using the GUI difftool:
$ git pr show -t 407
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/407.diff