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

8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1 #17935

Closed
wants to merge 1 commit into from

Conversation

LanceAndersen
Copy link
Contributor

@LanceAndersen LanceAndersen commented Feb 20, 2024

Please review the updates to open/src/java.base/share/legal/zlib.md to update the file from zlib 1.2.13 to zlib 1.3.1 which was missed as part of the PR for JDK-8324632


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-8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17935

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 20, 2024

👋 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 Feb 20, 2024
@openjdk
Copy link

openjdk bot commented Feb 20, 2024

@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 Feb 20, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 20, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Feb 20, 2024

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

8326351: Update the Zlib version in open/src/java.base/share/legal/zlib.md to 1.3.1

Reviewed-by: iris, naoto, jpai

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

  • 36246c9: 8326233: Utils#copySSLParameters loses needClientAuth Setting
  • 14f9aba: 8326371: [BACKOUT] Clean up NativeCompilation.gmk and its newly created parts
  • 1bd91cd: 8325963: Clean up NativeCompilation.gmk and its newly created parts
  • 4d50ee6: 8326368: compare.sh -2bins prints ugly errors on Windows
  • 221fbfb: 8320002: Remove obsolete CDS check in Reflection::verify_class_access()
  • d2590c6: 8325730: StringBuilder.toString allocation for the empty String
  • aa792ea: 8164094: javadoc allows to create a @link to a non-existent method
  • a2d027e: 8326089: Text incorrectly placed in breadcrumbs list in generated docs

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 the ready Pull request is ready to be integrated label Feb 20, 2024
Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

The change looks good to me.

@LanceAndersen
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 21, 2024

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

  • 51e2dde: 8326235: RISC-V: Size CodeCache for short calls encoding
  • c022431: 8326412: debuginfo files should not have executable bit set
  • 33834b7: 8326375: [REDO] Clean up NativeCompilation.gmk and its newly created parts
  • 2352268: 8326334: JFR failed assert(used(klass)) failed: invariant
  • 492e8bf: 8325587: Shenandoah: ShenandoahLock should allow blocking in VM
  • 5f16f34: 8326370: Remove redundant and misplaced micros from StringBuffers
  • 921507c: 8326319: G1: Remove unused G1ConcurrentMark::_init_times
  • 68eb5a1: 8321075: RISC-V: UseSystemMemoryBarrier lacking proper OS support
  • 04d43c4: 8187759: Background not refreshed when painting over a transparent JFrame
  • d5f3d5c: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • ... and 10 more: https://git.openjdk.org/jdk/compare/b419e9517361ed9d28f8ab2f5beacf5adfe3db91...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 21, 2024

@LanceAndersen Pushed as commit f0f4d63.

💡 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
Development

Successfully merging this pull request may close these issues.

4 participants