Skip to content

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

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

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 14, 2024

I backport this for parity with 17.0.12-oracle.

I backport the change in 21 which merged three related changes.

I had to resolve ChangeLog. Unfortunately in 21, "8283525: http://tools.ietf.org/html/* URLs return 404"
changed 'http' to https' in many files including this one, but this file should not
be touched as it is not owned by our project. But might be clean anyways.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • 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)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2300

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 14, 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 14, 2024

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

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

Reviewed-by: mbaesken

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

  • aa2cdb3: 8322503: Shenandoah: Clarify gc state usage
  • c0d209c: 8313307: java/util/Formatter/Padding.java fails on some Locales
  • e3ba201: Merge
  • 5fb5ba6: 8327391: Add SipHash attribution file
  • e100cf5: 8327036: [macosx-aarch64] SIGBUS in MarkActivationClosure::do_code_blob reached from Unsafe_CopySwapMemory0
  • 02eec99: 8328524: [x86] StringRepeat.java failure on linux-x86: Could not reserve enough space for 2097152KB object heap
  • d24d94b: 8328066: WhiteBoxResizeTest failure on linux-x86: Could not reserve enough space for 2097152KB object heap
  • 5b8a2e5: 8325372: Shenandoah: SIGSEGV crash in unnecessary_acquire due to LoadStore split through phi
  • 5fd79e9: 8322920: Some ProcessTools.execute* functions are declared to throw Throwable
  • f036fcf: 8312320: Remove javax/rmi/ssl/SSLSocketParametersTest.sh from ProblemList
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/373714b5fc8956b8982a47021f710293c733e26a...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 changed the title Backport 63fec5da27994b05a58ce1abcfe07a8ed8bc497b 8283525: http://tools.ietf.org/html/* URLs return 404 Mar 14, 2024
@openjdk
Copy link

openjdk bot commented Mar 14, 2024

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 Mar 14, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 14, 2024

Webrevs

@GoeLin GoeLin changed the title 8283525: http://tools.ietf.org/html/* URLs return 404 Backport 6d8d049e4a7c77d8aa8a5d71446de1deb64d96e9 Mar 15, 2024
@openjdk openjdk bot changed the title Backport 6d8d049e4a7c77d8aa8a5d71446de1deb64d96e9 8324632: Update Zlib Data Compression Library to Version 1.3.1 Mar 15, 2024
@openjdk
Copy link

openjdk bot commented Mar 15, 2024

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

@GoeLin
Copy link
Member Author

GoeLin commented Mar 15, 2024

GHA failures: x86: Could not reserve enough space for 2097152KB object heap in StringRepeat
Riscv: build setup issue
Both unrelated.

@openjdk
Copy link

openjdk bot commented Mar 20, 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 approval ready Pull request is ready to be integrated and removed approval labels Mar 20, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 21, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 21, 2024

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

  • a8a8128: 8305169: java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java -- test server didn't start in timely manner
  • 09f3890: 8297449: Update JInternalFrame Metal Border code
  • aa2cdb3: 8322503: Shenandoah: Clarify gc state usage
  • c0d209c: 8313307: java/util/Formatter/Padding.java fails on some Locales
  • e3ba201: Merge
  • 5fb5ba6: 8327391: Add SipHash attribution file
  • e100cf5: 8327036: [macosx-aarch64] SIGBUS in MarkActivationClosure::do_code_blob reached from Unsafe_CopySwapMemory0
  • 02eec99: 8328524: [x86] StringRepeat.java failure on linux-x86: Could not reserve enough space for 2097152KB object heap
  • d24d94b: 8328066: WhiteBoxResizeTest failure on linux-x86: Could not reserve enough space for 2097152KB object heap
  • 5b8a2e5: 8325372: Shenandoah: SIGSEGV crash in unnecessary_acquire due to LoadStore split through phi
  • ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/373714b5fc8956b8982a47021f710293c733e26a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 21, 2024

@GoeLin Pushed as commit 6359b28.

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

@GoeLin GoeLin deleted the goetz_backport_8324632 branch March 21, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants