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 #355

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 12, 2024

I backport this to keep this external lib up to date and to match OracleJDK.

Consists of three clean backports. I want to merge them here to limit the effort of further backporting:

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

Will mark clean.


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/jdk21u-dev.git pull/355/head:pull/355
$ git checkout pull/355

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 355

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 12, 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 openjdk bot changed the title Backport b6ed6d8f337ae79b6bc4274fba0b4f4722a627f2 8326360: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3 Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 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 12, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 12, 2024

Webrevs

@GoeLin GoeLin changed the title 8326360: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3 Backport b5c267fc8a0af50be9e3d1d09cdaa6bf4bb29851 Mar 12, 2024
@openjdk openjdk bot changed the title Backport b5c267fc8a0af50be9e3d1d09cdaa6bf4bb29851 8324632: Update Zlib Data Compression Library to Version 1.3.1 Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

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

@GoeLin
Copy link
Member Author

GoeLin commented Mar 12, 2024

GHA test failure on linux-x86:
Could not reserve enough space for 2097152KB object heap
Should be unrelated.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 12, 2024

/issue 8315117

@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@GoeLin
Adding additional issue to issue list: 8315117: Update Zlib Data Compression Library to Version 1.3.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 12, 2024

/issue 8326351

@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@GoeLin
Adding additional issue to issue list: 8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 12, 2024

/clean

@openjdk openjdk bot added the clean label Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Mar 12, 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
Copy link

openjdk bot commented Mar 13, 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

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

  • 93fd1a1: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • ad5a087: 8321815: Shenandoah: gc state should be synchronized to java threads only once per safepoint
  • 608c98d: 8326496: [test] checkHsErrFileContent support printing hserr in error case
  • d42da09: 8325743: test/jdk/java/nio/channels/unixdomain/SocketOptions.java enhance user name output in error case
  • 2a6688f: 8320129: "top" command during jtreg failure handler does not display CPU usage on OSX
  • da02da7: 8325432: enhance assert message "relocation addr must be in this section"

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

GoeLin commented Mar 14, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2024

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

  • 5431b82: 8322239: [macos] a11y : java.lang.NullPointerException is thrown when focus is moved on the JTabbedPane
  • 5762df6: 8321489: Update LCMS to 2.16
  • a69c437: 8316559: Refactor some util/Calendar tests to JUnit
  • 390e647: 8313612: Use JUnit in lib-test/jdk tests
  • 539b04e: 8314832: Few runtime/os tests ignore vm flags
  • 0d3a4e2: 8310818: Refactor more Locale tests to use JUnit
  • 166aad0: 8310731: Configure a javax.net.ssl.SNIMatcher for the HTTP/1.1 test servers in java/net/httpclient tests
  • 58b3403: 8310234: Refactor Locale tests to use JUnit
  • e3b6098: 8322503: Shenandoah: Clarify gc state usage
  • 93fd1a1: 8324238: [macOS] java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails with the shape has not been applied msg
  • ... and 5 more: https://git.openjdk.org/jdk21u-dev/compare/c80be84cdda88e83c32eae6e18f7dacc536e5383...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 14, 2024

@GoeLin Pushed as commit 6d8d049.

💡 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 14, 2024 20:22
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