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

8324632: Update Zlib Data Compression Library to Version 1.3.1 #2618

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 22, 2024

I backport this for parity with 11.0.24-oracle.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8326351 needs maintainer approval
  • JDK-8324632 needs maintainer approval
  • JDK-8315117 needs maintainer approval

Issues

  • JDK-8324632: Update Zlib Data Compression Library to Version 1.3.1 (Enhancement - P4 - Approved)
  • JDK-8315117: Update Zlib Data Compression Library to Version 1.3 (Enhancement - P4 - Approved)
  • JDK-8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1 (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2618

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 2024

👋 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
Copy link

openjdk bot commented Mar 22, 2024

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

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

8324632: Update Zlib Data Compression Library to Version 1.3.1
8315117: Update Zlib Data Compression Library to Version 1.3
8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1

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

  • f8225a4: 8313206: PKCS11 tests silently skip execution
  • 8c18317: 8270199: Most SA tests are skipped on macosx-aarch64 because all executables are signed
  • c782d4c: 8312383: Log X509ExtendedKeyManager implementation class name in TLS/SSL connection

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

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

@openjdk openjdk bot changed the title Backport 6359b2843f83852561b925d3f1315eed5f4b9cda 8324632: Update Zlib Data Compression Library to Version 1.3.1 Mar 22, 2024
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 22, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 22, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 22, 2024

Webrevs

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Mar 23, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 25, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 25, 2024

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

  • f8225a4: 8313206: PKCS11 tests silently skip execution
  • 8c18317: 8270199: Most SA tests are skipped on macosx-aarch64 because all executables are signed
  • c782d4c: 8312383: Log X509ExtendedKeyManager implementation class name in TLS/SSL connection

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 25, 2024

@GoeLin Pushed as commit 6aa7216.

💡 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