Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 28, 2021

I want to "backport" 8265524 to jdk11u.
Unfortunately, the original issue has no patch attached, it's only Oracle internal.
So normal backporting does not work.

Luckily, the bug nicely describes where to get the sources, so I crafted the change myself.
So please review. Ev. compare to https://github.com/Stuk/jszip/releases v.3.6.0.
I also adapted the license as happened in "JDK-8236700 Upgrading JSZip from v3.1.5 to v3.2.2".
That is the MIT license from th jszip github repo.

I'm not completely clear whether this should be considered a Backport, or a new Enhancement.
Also, I guess, the bots will not grok this is a backport, I will have to update the JBS issue accordingly.
I might even have a problem submitting this because I used the bugID of the original issue.


Progress

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

Issue

  • JDK-8265524: Upgrading JSZip from v3.2.2 to v3.6.0 ⚠️ Issue is not open.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/439/head:pull/439
$ git checkout pull/439

Update a local copy of the PR:
$ git checkout pull/439
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/439/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 439

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/439.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 2021

👋 Welcome back goetz! 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 Pull request is ready for review label Sep 28, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 28, 2021

Webrevs

@kevinrushforth
Copy link
Member

I'm not completely clear whether this should be considered a Backport, or a new Enhancement.
Also, I guess, the bots will not grok this is a backport, I will have to update the JBS issue accordingly.
I might even have a problem submitting this because I used the bugID of the original issue.

This will work as expected. The Skara bots will happily create or update a backport record if you use the main bug ID.

@GoeLin
Copy link
Member Author

GoeLin commented Sep 28, 2021

Thanks, Kevin! (How did you pick this out from my many PRs?)

@RealCLanger
Copy link
Contributor

I'm not completely clear whether this should be considered a Backport, or a new Enhancement.
Also, I guess, the bots will not grok this is a backport, I will have to update the JBS issue accordingly.
I might even have a problem submitting this because I used the bugID of the original issue.

This will work as expected. The Skara bots will happily create or update a backport record if you use the main bug ID.

The PR title should be Backport 'JDK-8265524', correct?

@kevinrushforth
Copy link
Member

Thanks, Kevin! (How did you pick this out from my many PRs?)

I just happened to spot it as it went by.

@kevinrushforth
Copy link
Member

The PR title should be Backport 'JDK-8265524', correct?

No, the PR title is correct as-is.

A backport-style PR needs a 40-char commit hash (which this one doesn't have). So this is just an "ordinary-style" PR.

Regardless of what type of PR it is, once the fix is integrated, Skara will do the same thing as for any commit that is pushed: look up the bug ID, check the fix version of the repo that the fix went into, find a matching record (main bug or backport) or create one if there is no matching record alread.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

@openjdk
Copy link

openjdk bot commented Sep 30, 2021

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

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

8265524: Upgrading JSZip from v3.2.2 to v3.6.0

Reviewed-by: mdoerr

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:

  • 23c3845: 8229935: [TEST_BUG]: bug8132119.java inconsistently positions text
  • ed98060: 8223137: Rename predicate 'do_unroll_only()' to 'is_unroll_only()'.
  • b79e707: 8269426: Rename test/jdk/java/lang/invoke/t8150782 to accessClassAndFindClass
  • b9f0143: 8196096: javax/swing/JPopupMenu/6580930/bug6580930.java fails
  • 05cb444: 8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures
  • dce04a2: 8272342: [TEST_BUG] java/awt/print/PrinterJob/PageDialogMarginTest.java catches all exceptions
  • 89d4ef2: 8078219: Verify lack of @test tag in files in java/net test directory
  • e5b1dbf: 8231501: VM crash in MethodData::clean_extra_data(CleanExtraDataClosure*): fatal error: unexpected tag 99
  • f139171: 8215889: assert(!_unloading) failed: This oop is not available to unloading class loader data with ZGC
  • 97859e8: 8268093: Manual Testcase: "sun/security/krb5/config/native/TestDynamicStore.java" Fails with NPE
  • ... and 5 more: https://git.openjdk.java.net/jdk11u-dev/compare/ba3cc92209723168ec10cfe242461fb369f71ae8...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 30, 2021
@GoeLin
Copy link
Member Author

GoeLin commented Oct 1, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 1, 2021

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

  • 9f8c13c: 8233569: [TESTBUG] JTextComponent test bug6361367.java fails on macos
  • a6ee356: 8234823: java/net/Socket/Timeouts.java testcase testTimedConnect2() fails on Windows 10
  • 23c3845: 8229935: [TEST_BUG]: bug8132119.java inconsistently positions text
  • ed98060: 8223137: Rename predicate 'do_unroll_only()' to 'is_unroll_only()'.
  • b79e707: 8269426: Rename test/jdk/java/lang/invoke/t8150782 to accessClassAndFindClass
  • b9f0143: 8196096: javax/swing/JPopupMenu/6580930/bug6580930.java fails
  • 05cb444: 8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures
  • dce04a2: 8272342: [TEST_BUG] java/awt/print/PrinterJob/PageDialogMarginTest.java catches all exceptions
  • 89d4ef2: 8078219: Verify lack of @test tag in files in java/net test directory
  • e5b1dbf: 8231501: VM crash in MethodData::clean_extra_data(CleanExtraDataClosure*): fatal error: unexpected tag 99
  • ... and 7 more: https://git.openjdk.java.net/jdk11u-dev/compare/ba3cc92209723168ec10cfe242461fb369f71ae8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 1, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated labels Oct 1, 2021
@openjdk
Copy link

openjdk bot commented Oct 1, 2021

@GoeLin Pushed as commit f7a75de.

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

@openjdk openjdk bot removed the rfr Pull request is ready for review label Oct 1, 2021
@GoeLin GoeLin deleted the goetz_backport_8265524 branch October 1, 2021 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants