Navigation Menu

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

8274864: Remove Amman/Cairo hacks in ZoneInfoFile #1828

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Apr 13, 2023

Hi all,

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

The commit being backported was authored by Naoto Sato on 8 Oct 2021 and was reviewed by Iris Clark and Joe Wang.

It is a pre-requisite for backporting the latest tzdata update, JDK-8305113 and has already been backported to Oracle's 11.0.20.

Backport is clean. Tests in java/util/TimeZone, java/time/test, sun/util/calendar, sun/util/resources and sun/text/resources show no regressions (I see java/time/test/java/time/format/TestUTCParse.java failing both patched and unpatched)

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8274864: Remove Amman/Cairo hacks in ZoneInfoFile

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1828

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 13, 2023

👋 Welcome back andrew! 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 ec199072c5867624d66840238cc8828e16ae8da7 8274864: Remove Amman/Cairo hacks in ZoneInfoFile Apr 13, 2023
@openjdk
Copy link

openjdk bot commented Apr 13, 2023

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

@openjdk
Copy link

openjdk bot commented Apr 13, 2023

@gnu-andrew This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8274864: Remove Amman/Cairo hacks in ZoneInfoFile

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 13, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 13, 2023

Webrevs

@gnu-andrew
Copy link
Member Author

Windows configure seems to be broken, but don't see that being caused by this change.
I see jdk11u-fix-yes
/integrate

@openjdk
Copy link

openjdk bot commented Apr 13, 2023

Going to push as commit b4caafe.
Since your change was applied there has been 1 commit pushed to the master branch:

  • bb2e0d8: 8305528: [11u] Backport of JDK-8259530 breaks build with JDK10 bootstrap VM

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 13, 2023

@gnu-andrew Pushed as commit b4caafe.

💡 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
backport clean integrated Pull request has been integrated
1 participant