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

8294357: (tz) Update Timezone Data to 2022d #10460

Closed
wants to merge 3 commits into from

Conversation

satoyoshiki
Copy link

@satoyoshiki satoyoshiki commented Sep 28, 2022

Please review this PR. The change include some code changes in ZoneInfoFile.java and TestZoneInfo310.java since tzdata2022d breaks TestZoneInfo310.java.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10460

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 2022

👋 Welcome back ysatowse! 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.

@satoyoshiki
Copy link
Author

/issue JDK-8294357

@openjdk openjdk bot changed the title 1st commit for tz2022d 8294357: (tz) Update Timezone Data to 2022d Sep 28, 2022
@openjdk
Copy link

openjdk bot commented Sep 28, 2022

@satoyoshiki The primary solved issue for a PR is set through the PR title. Since the current title does not contain an issue reference, it will now be updated.

@openjdk
Copy link

openjdk bot commented Sep 28, 2022

@satoyoshiki The following labels will be automatically applied to this pull request:

  • core-libs
  • i18n

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

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Sep 28, 2022
Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

Some minor comments

Comment on lines 585 to 588
// "last", it works for now. From tzdata2020d this hacking
// will not work for Asia/Gaza and Asia/Hebron which follow
// Palestine DST rules.
if (dom < 0 || dom >= 24 &&
!(zoneId.equals("Asia/Gaza") ||
zoneId.equals("Asia/Hebron"))) {
// No need of hacking for Plaestine DST rules from tz2022d
Copy link
Member

Choose a reason for hiding this comment

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

Should this comment be removed, or at least modified to be better explained?

Comment on lines 200 to 201
zid.equals("Asia/Gaza") ||
zid.equals("Asia/Hebron") ||
Copy link
Member

Choose a reason for hiding this comment

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

It'd be helpful to append // uses "Palestine" rule.

@satoyoshiki satoyoshiki marked this pull request as ready for review September 30, 2022 00:30
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 30, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2022

Webrevs

Comment on lines -166 to -170
Europe/Uzhgorod EET EEST
Europe/Vienna CET CEST
Europe/Vilnius EET EEST
Europe/Warsaw CET CEST
Europe/Zaporozhye EET EEST
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to remove those newly linked zone ids from testing?

Copy link
Author

Choose a reason for hiding this comment

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

This file is not maintained by hand but generated from java/util/TimeZone/TimeZoneData/tools/share/Makefile.
These two Ukraine zones are integrated to Europe/Kyiv and removed from tzdata/europe, so the entries disappeared in this file.

Copy link
Member

Choose a reason for hiding this comment

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

OK. It's a bit odd that the links are removed for the test because they still exist as zone ids, and should have the same name as Europe/Kyiv.

Copy link
Contributor

@coffeys coffeys 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 Sep 30, 2022

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

8294357: (tz) Update Timezone Data to 2022d

Reviewed-by: naoto, coffeys

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

  • 64da862: 8287597: List all preview features on the javadoc PREVIEW page
  • b4e1e41: 8293000: Review running times of jshell regression tests
  • 6d83482: 8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts
  • 6974978: 8294521: Parallel: Remove unused field in UpdateDensePrefixAndCompactionTask
  • 81fda1b: 8294569: Remove CardTable::_last_valid_index
  • 7c60e6d: 8293770: RISC-V: Reuse runtime call trampolines
  • 9dce865: 8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll
  • b030c7d: 8225235: Unused field defaultIndex in NetworkInterface
  • a07975b: 8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output
  • 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
  • ... and 48 more: https://git.openjdk.org/jdk/compare/aa48705dddee674baa479f5128cfc3b426d87d2d...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@naotoj, @coffeys) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 30, 2022
@satoyoshiki
Copy link
Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 30, 2022
@openjdk
Copy link

openjdk bot commented Sep 30, 2022

@satoyoshiki
Your change (at version a896323) is now ready to be sponsored by a Committer.

@naotoj
Copy link
Member

naotoj commented Sep 30, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 30, 2022

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

  • 64da862: 8287597: List all preview features on the javadoc PREVIEW page
  • b4e1e41: 8293000: Review running times of jshell regression tests
  • 6d83482: 8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts
  • 6974978: 8294521: Parallel: Remove unused field in UpdateDensePrefixAndCompactionTask
  • 81fda1b: 8294569: Remove CardTable::_last_valid_index
  • 7c60e6d: 8293770: RISC-V: Reuse runtime call trampolines
  • 9dce865: 8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll
  • b030c7d: 8225235: Unused field defaultIndex in NetworkInterface
  • a07975b: 8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output
  • 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
  • ... and 48 more: https://git.openjdk.org/jdk/compare/aa48705dddee674baa479f5128cfc3b426d87d2d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 30, 2022

@naotoj @satoyoshiki Pushed as commit f015733.

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