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

8295530: Update Zlib Data Compression Library to Version 1.2.13 #983

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 23, 2022

I backport this for parity with 17.0.7-oracle.


Progress

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

Issue

  • JDK-8295530: Update Zlib Data Compression Library to Version 1.2.13

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/983/head:pull/983
$ git checkout pull/983

Update a local copy of the PR:
$ git checkout pull/983
$ git pull https://git.openjdk.org/jdk17u-dev pull/983/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 983

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/983.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 23, 2022

👋 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 changed the title Backport 0c13d66622a8c2be654bb867aa8c17421d1557ca 8295530: Update Zlib Data Compression Library to Version 1.2.13 Dec 23, 2022
@openjdk
Copy link

openjdk bot commented Dec 23, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 23, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 23, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 27, 2022

/clean

I backported this with the /backport jdk17u-dev command, so it is clean.

@openjdk openjdk bot added the clean label Dec 27, 2022
@openjdk
Copy link

openjdk bot commented Dec 27, 2022

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Dec 27, 2022

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

8295530: Update Zlib Data Compression Library to Version 1.2.13

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

  • 244d194: 8293562: KeepAliveCache Blocks Threads while Closing Connections
  • eb95804: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 8b0c5b9: 8292660: C2: blocks made unreachable by NeverBranch-to-Goto conversion are removed incorrectly
  • 9729dad: 8292877: java/util/concurrent/atomic/Serial.java uses {Double,Long}Accumulator incorrectly
  • ade0edf: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
  • 6262937: 8155246: Throw error if default java.security file is missing
  • e770114: 8288130: compiler error with AP and explicit record accessor
  • d72709f: 8285399: JNI exception pending in awt_GraphicsEnv.c:1432
  • d8cc8a8: 8282577: ICC_Profile.setData(int, byte[]) invalidates the profile
  • ddaa77b: 8279119: src/jdk.hotspot.agent/doc/index.html file contains references to scripts that no longer exist
  • ... and 7 more: https://git.openjdk.org/jdk17u-dev/compare/e262f644706c4dce5e5ef4c8d9dda3e8e9f6fffe...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 Dec 27, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Dec 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 29, 2022

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

  • 219041d: 8275173: testlibrary_tests/ir_framework/tests/TestCheckedTests.java fails after JDK-8274911
  • c603f82: 8287217: C2: PhaseCCP: remove not visited nodes, prevent type inconsistency
  • e33c871: 8065097: [macosx] javax/swing/Popup/TaskbarPositionTest.java fails because Popup is one pixel off
  • 032f007: 8273410: IR verification framework fails with "Should find method name in validIrRulesMap"
  • bcdaebf: 8298027: Remove SCCS id's from awt jtreg tests
  • 70f235d: 8293767: AWT test TestSinhalaChar.java has old SCCS markings
  • 11a53b7: Merge
  • 41c9d7d: 8293010: JDI ObjectReference/referringObjects/referringObjects001 fails: assert(env->is_enabled(JVMTI_EVENT_OBJECT_FREE)) failed: checking
  • 0ab310e: 8280890: Cannot use '-Djava.system.class.loader' with class loader in signed JAR
  • 244d194: 8293562: KeepAliveCache Blocks Threads while Closing Connections
  • ... and 16 more: https://git.openjdk.org/jdk17u-dev/compare/e262f644706c4dce5e5ef4c8d9dda3e8e9f6fffe...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 29, 2022
@openjdk openjdk bot closed this Dec 29, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 29, 2022
@openjdk
Copy link

openjdk bot commented Dec 29, 2022

@GoeLin Pushed as commit 6042c6b.

💡 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
backport clean integrated Pull request has been integrated
1 participant