jdk11u-dev
jdk11u-dev copied to clipboard
8352716: (tz) Update Timezone Data to 2025b
Backport of tzdata2025b. Nearly clean, but contains zone.tab file, which was removed by JDK-8166983.
Reverted change to test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt and .../displaynames.txt when running make in test/jdk/java/util/TimeZone/tools/share to avoid the java/util/TimeZone/Bug6329116.java test failing, just as was done previously for 2024b.
Passed tier1 tests and make run-test TEST="jdk/java/util/TimeZone jdk/java/time/test jdk/sun/util/resources jdk/sun/text/resources jdk/sun/util/calendar" locally, GHA sanity tests (other than known failure).
Progress
- [x] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [ ] JDK-8352716 needs maintainer approval
Issue
- JDK-8352716: (tz) Update Timezone Data to 2025b (Enhancement - P3 - Requested)
Reviewers
- Sergey Bylokhov (@mrserb - Reviewer)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/3020/head:pull/3020
$ git checkout pull/3020
Update a local copy of the PR:
$ git checkout pull/3020
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/3020/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3020
View PR using the GUI difftool:
$ git pr show -t 3020
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/3020.diff
Using Webrev
:wave: Welcome back ssubramaniam! 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.
@satyenme This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
8352716: (tz) Update Timezone Data to 2025b
Reviewed-by: serb
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:
- 5ce10dfe2d1a89e84d59fb40ad0e09ffdf819c74: 8345133: Test sun/security/tools/jarsigner/TsacertOptionTest.java failed: Warning found in stdout
- 657f3cd3e5dea5dead60db45e9e168f8ed0e0b65: Merge
- 13dab160c693baa33af6236792f1cf55de7318b2: 8352097: (tz) zone.tab update missed in 2025a backport
- ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/6b7a312bd3255b4b020d3f027a98e7831f575dd4...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 (@mrserb) 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).
This backport pull request has now been updated with issue from the original commit.
⚠️ @satyenme This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.
/approval request for backport of 2025b tzdata. Nearly clean, but needed to re-add zone.tab file, which was removed by JDK-8166983.
Risk: Medium to Low. Tier 1 and relevant tz tests passing, as well as GHA sanity check tests. Backporting tzdata changes is a common enough procedure that, after review, we can be reasonably confident will work as intended.
Testing:
- GHA Sanity Checks (with 1 known, unrelated failure)
- Tier 1 tests locally
make run-test TEST="jdk/java/util/TimeZone jdk/java/time/test jdk/sun/util/resources jdk/sun/text/resources jdk/sun/util/calendar"
@satyenme 8352716: The approval request has been created successfully.
/integrate
@satyenme Your change (at version 5fa173db25aac1b88ac386fd75642c8316ac2771) is now ready to be sponsored by a Committer.
/sponsor
Going to push as commit dcc970180a09ff70748285f391a8f3829f64cb69.
Since your change was applied there have been 8 commits pushed to the master branch:
- 5ce10dfe2d1a89e84d59fb40ad0e09ffdf819c74: 8345133: Test sun/security/tools/jarsigner/TsacertOptionTest.java failed: Warning found in stdout
- 657f3cd3e5dea5dead60db45e9e168f8ed0e0b65: Merge
- 13dab160c693baa33af6236792f1cf55de7318b2: 8352097: (tz) zone.tab update missed in 2025a backport
- ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/6b7a312bd3255b4b020d3f027a98e7831f575dd4...master
Your commit was automatically rebased without conflicts.
@phohensee @satyenme Pushed as commit dcc970180a09ff70748285f391a8f3829f64cb69.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.