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

8272180: Upgrade JSZip from v3.6.0 to v3.7.1 #407

Closed
wants to merge 1 commit into from
Closed

Conversation

jmtd
Copy link

@jmtd jmtd commented Sep 24, 2021

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 and jszip.min.js are straight copies of the corresponding files from the path dist/ in the jszip archive.

src/jdk.javadoc/share/legal/jszip.md is a copy of jszip-3.7.1/LICENSE.markdown with the following modifications:

  • added ## JSZip v3.7.1 markdown header
  • changed markdown headings to match the levels in the openjdk copy of the license (I.e., switched underline-style level 2 headings to prefix-style level 3 headings)
  • added backticks to indicate pre-formatted text

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:

$JAVA_HOME/bin/javadoc -cp src/main/java --add-modules java.desktop -verbose  -d . org.redmars.wadc

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

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

Issues

  • JDK-8272180: Upgrade JSZip from v3.6.0 to v3.7.1 ⚠️ Issue is not open.
  • JDK-8272828: Add correct licenses to jszip.md ⚠️ Issue is not open.

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 24, 2021

👋 Welcome back jdowland! 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 openjdk bot added the rfr label Sep 24, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 24, 2021

Webrevs

@jmtd
Copy link
Author

@jmtd jmtd commented Oct 4, 2021

I've rebase this PR on top of master since #439 was merged.

GoeLin
GoeLin approved these changes Oct 5, 2021
Copy link
Member

@GoeLin GoeLin left a comment

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.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 5, 2021

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

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

8272180: Upgrade JSZip from v3.6.0 to v3.7.1
8272828: Add correct licenses to jszip.md

Reviewed-by: goetz

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 master branch:

  • b1bab7f: 8272570: C2: crash in PhaseCFG::global_code_motion
  • 58fe5e8: 8273924: ArrayIndexOutOfBoundsException thrown in java.util.JapaneseImperialCalendar.add()
  • 881ae69: 8274326: [macos] Ensure initialisation of sun/lwawt/macosx/CAccessibility in JavaComponentAccessibility.m
  • 7f5569c: 8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY"
  • 620726e: 8262438: sun/security/ssl/SSLLogger/LoggingFormatConsistency.java failed with "SocketException: Socket is closed"
  • 76511ca: 8159904: [TEST_BUG] Failure on solaris of java/awt/Window/MultiWindowApp/MultiWindowAppTest.java
  • f248ceb: 8265173: [test] divert spurious log output away from stream under test in ProcessBuilder Basic test
  • f5e2a9d: 8263897: compiler/c2/aarch64/TestVolatilesSerial.java failed with "java.lang.RuntimeException: Wrong method"
  • 89aec26: 8075909: [TEST_BUG] The regression-swing case failed as it does not have the 'Open' button when select 'subdir' folder with NimbusLAF
  • 456d4fb: 8159597: [TEST_BUG] closed/javax/swing/JPopupMenu/4760494/bug4760494.java leaves key pressed
  • ... and 15 more: https://git.openjdk.java.net/jdk11u-dev/compare/f12af7e06c128b2771c4a5e9d83f0947755e4db6...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.

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 /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 Oct 5, 2021
@jmtd
Copy link
Author

@jmtd jmtd commented Oct 5, 2021

@GoeLin wrote:

LGTM

Thank you!

I've flagged https://bugs.openjdk.java.net/browse/JDK-8272180 "jdk11u-fix-request" and I would normally await
someone changing that to "yes" before I issued integrate.

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.

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!

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 5, 2021

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?

@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.

@jmtd
Copy link
Author

@jmtd jmtd commented Oct 6, 2021

/issue JDK-8272828

@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

@jmtd
Adding additional issue to issue list: 8272828: Add correct licenses to jszip.md.

@jmtd
Copy link
Author

@jmtd jmtd commented Oct 7, 2021

/integrate

@openjdk openjdk bot added the sponsor label Oct 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

@jmtd
Your change (at version 10df79a) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 7, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

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

  • cbdb8c2: 8272581: sun/security/pkcs11/Provider/MultipleLogins.sh fails after JDK-8266182
  • b1bab7f: 8272570: C2: crash in PhaseCFG::global_code_motion
  • 58fe5e8: 8273924: ArrayIndexOutOfBoundsException thrown in java.util.JapaneseImperialCalendar.add()
  • 881ae69: 8274326: [macos] Ensure initialisation of sun/lwawt/macosx/CAccessibility in JavaComponentAccessibility.m
  • 7f5569c: 8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY"
  • 620726e: 8262438: sun/security/ssl/SSLLogger/LoggingFormatConsistency.java failed with "SocketException: Socket is closed"
  • 76511ca: 8159904: [TEST_BUG] Failure on solaris of java/awt/Window/MultiWindowApp/MultiWindowAppTest.java
  • f248ceb: 8265173: [test] divert spurious log output away from stream under test in ProcessBuilder Basic test
  • f5e2a9d: 8263897: compiler/c2/aarch64/TestVolatilesSerial.java failed with "java.lang.RuntimeException: Wrong method"
  • 89aec26: 8075909: [TEST_BUG] The regression-swing case failed as it does not have the 'Open' button when select 'subdir' folder with NimbusLAF
  • ... and 16 more: https://git.openjdk.java.net/jdk11u-dev/compare/f12af7e06c128b2771c4a5e9d83f0947755e4db6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 7, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Oct 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

@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.

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