Skip to content

Commit

Permalink
8326351: Update the Zlib version in open/src/java.base/share/legal/zl…
Browse files Browse the repository at this point in the history 
…ib.md to 1.3.1

Reviewed-by: iris, naoto, jpai
  • Loading branch information
Lance Andersen committed Feb 21, 2024
1 parent 51e2dde commit f0f4d63
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/java.base/share/legal/zlib.md
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## zlib v1.2.13
## zlib v1.3.1

### zlib License
<pre>

Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down

3 comments on commit f0f4d63

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@raviniitw2012
Copy link

Choose a reason for hiding this comment

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

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on f0f4d63 Jun 4, 2024

Choose a reason for hiding this comment

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

@raviniitw2012 Could not automatically backport f0f4d63f to openjdk/jdk22u due to conflicts in the following files:

  • src/java.base/share/legal/zlib.md

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk22u. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk22u.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-raviniitw2012-f0f4d63f-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git f0f4d63fa9c9f487198b2a2b7b410b590e1437bc

# Backport the commit
$ git cherry-pick --no-commit f0f4d63fa9c9f487198b2a2b7b410b590e1437bc
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport f0f4d63fa9c9f487198b2a2b7b410b590e1437bc'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk22u with the title Backport f0f4d63fa9c9f487198b2a2b7b410b590e1437bc.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit f0f4d63f from the openjdk/jdk repository.

The commit being backported was authored by Lance Andersen on 21 Feb 2024 and was reviewed by Iris Clark, Naoto Sato and Jaikiran Pai.

Thanks!

Please sign in to comment.