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

8315117: Update Zlib Data Compression Library to Version 1.3 #15453

Closed
wants to merge 1 commit into from

Conversation

LanceAndersen
Copy link
Contributor

@LanceAndersen LanceAndersen commented Aug 28, 2023

Hi all,

Please review this PR which updates zlib from 1.2.13 to 1.3 in openJDK

The Zlib Data Compression Library has released Zlib 1.3 on August 18, 2023.

There are a small number of updates between 1.2.13 and 1.3

Mach5 tiers1-6 have run clean as do the JCK tests


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

Issue

  • JDK-8315117: Update Zlib Data Compression Library to Version 1.3 (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15453/head:pull/15453
$ git checkout pull/15453

Update a local copy of the PR:
$ git checkout pull/15453
$ git pull https://git.openjdk.org/jdk.git pull/15453/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15453

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15453.diff

Webrev

Link to Webrev Comment

@LanceAndersen LanceAndersen marked this pull request as ready for review August 28, 2023 16:31
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 28, 2023

👋 Welcome back lancea! 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 Aug 28, 2023
@openjdk
Copy link

openjdk bot commented Aug 28, 2023

@LanceAndersen The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Aug 28, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 28, 2023

Webrevs

@AlanBateman
Copy link
Contributor

Are there any changes from the upstream zlib 1.3 code that should be called out or is zlib 1.3 copied in without any changes?

@LanceAndersen
Copy link
Contributor Author

Are there any changes from the upstream zlib 1.3 code that should be called out or is zlib 1.3 copied in without any changes?

It was a clean copy(which I have been able to do as of zlib 1.2.13). Sorry I should have mentioned this in the PR request

@AlanBateman
Copy link
Contributor

It was a clean copy(which I have been able to do as of zlib 1.2.13). Sorry I should have mentioned this in the PR request

That's okay, I just wanted to check to be sure that the ChangeLog_java (renamed adler32.c -> zadler32.c, crc32c -> zcrc32.c) is everything.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

Okay, assuming tests are passing on windows-x64 and macos-aarch64 as these are the two that will usually use the bundled zlib.

@openjdk
Copy link

openjdk bot commented Aug 29, 2023

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

8315117: Update Zlib Data Compression Library to Version 1.3

Reviewed-by: alanb

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

  • a4e97aa: 8314753: Remove support for @beaninfo, @todo, @since.unbundled, and @note
  • 5cc64cc: 8309463: IGV: Dynamic graph layout algorithm
  • 1d02507: 8314476: TestJstatdPortAndServer.java failed with "java.rmi.NoSuchObjectException: no such object in table"
  • 93188bd: 8314569: (fs) Improve normalization of UnixPath for input with trailing slashes
  • 8b8182d: 8315087: G1: Use uint for G1 flags indicating percentage
  • 3dc266c: 8315070: RISC-V: Clean up platform dependent inline headers
  • 25f5df2: 8315073: Zero build on macOS fails after JDK-8303852
  • a03954e: 8309697: [TESTBUG] Remove "@requires vm.flagless" from jtreg vectorization tests
  • e5ea9aa: 8312570: [TESTBUG] Jtreg compiler/loopopts/superword/TestDependencyOffsets.java fails on 512-bit SVE
  • 1cb2cc6: 8308464: Shared array class should not always be loaded in boot loader
  • ... and 34 more: https://git.openjdk.org/jdk/compare/acaab6fd74f507bb6b18167505d88e505bdf24bd...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 Aug 29, 2023
@LanceAndersen
Copy link
Contributor Author

Okay, assuming tests are passing on windows-x64 and macos-aarch64 as these are the two that will usually use the bundled zlib.

Yes, both were clean in my mach5 runs

@LanceAndersen
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

  • e29f0c2: 8297777: Convert jdk.jlink StringSharingPlugin to use Class File API
  • bf63945: 8298992: runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)"
  • cb3f968: 8314651: G1: Fix -Wconversion warnings in static fields of HeapRegion
  • 876a725: 8315206: RISC-V: hwprobe query is_set return wrong value
  • ed1ea5f: 8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
  • f3aeb02: 8315213: java/lang/ProcessHandle/TreeTest.java test enhance output of children
  • 1e7e2bc: 8315214: Do not run sun/tools/jhsdb tests concurrently
  • ce2a7ea: 8314056: Remove runtime platform check from frem/drem
  • 1c598c2: 8312428: PKCS11 tests fail with NSS 3.91
  • b2728cb: 8189685: need PerfMemory class update and a volatile_static_field support in VMStructs
  • ... and 46 more: https://git.openjdk.org/jdk/compare/acaab6fd74f507bb6b18167505d88e505bdf24bd...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 30, 2023

@LanceAndersen Pushed as commit 6701eba.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants