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

8209167: Use CLDR's time zone mappings for Windows #1848

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 24, 2023

I backport this for parity with 11.0.20-oracle.

I had to adapt Copy-java.base.gmk.


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-8209167: Use CLDR's time zone mappings for Windows

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1848

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 24, 2023

👋 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 009cd15a1bf44a300569df0dc6ac833e95a6736a 8209167: Use CLDR's time zone mappings for Windows Apr 24, 2023
@openjdk
Copy link

openjdk bot commented Apr 24, 2023

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 Apr 24, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 24, 2023

Webrevs

Copy link
Member

@reinrich reinrich left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Apr 24, 2023

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

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

8209167: Use CLDR's time zone mappings for Windows

Reviewed-by: rrich

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 21 new commits pushed to 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 Apr 24, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Apr 24, 2023

Pre-submit failure:
Run Visual Studio Installer
Error: Process completed with exit code 1.
Unrelated.

@GoeLin
Copy link
Member Author

GoeLin commented Apr 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 25, 2023

@GoeLin Pushed as commit 6dc0712.

💡 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_8209167 branch April 25, 2023 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants