8388214: (tz) Update Timezone Data to 2026c - #32240
Conversation
|
👋 Welcome back OumaIntissar! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
|
@OumaIntissar The following labels will be automatically applied to this pull request:
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. |
| private static final Map<String, ZoneOffset> EXPLICIT_CLDR_DST_OFFSETS = Map.of( | ||
| "Africa/Windhoek", ZoneOffset.of("+02:00"), | ||
| "America/Vancouver", ZoneOffset.of("-07:00"), | ||
| "Canada/Pacific", ZoneOffset.of("-07:00"), | ||
| "Europe/Dublin", ZoneOffset.of("+01:00"), | ||
| "Eire", ZoneOffset.of("+01:00")); |
There was a problem hiding this comment.
Since these are golden test data, I think hard-coding the explicit dst information is fine. However, I think it would be helpful to add a comment indicating the corresponding CLDR version for these data.
Nit: I think CLDR_EXPLICIT_DST_OFFSETS would be a better field name.
| {WINDHOEK, LocalDate.of(2016, 9, 23), OFF_2, OFF_1, true}, | ||
|
|
||
| // Africa/Casablanca for the Rule "Morocco" Defines negative DST till 2037 as of 2019a. | ||
| // Africa/Casablanca for the Rule "Morocco" |
There was a problem hiding this comment.
I'd prefer changing the comment to "Defines negative DST until early 2026, and permanent DST later that year, starting with 2026c". Also I'd leave one test case for the year 2038 (previously the last one).
| "Canada/Mountain", "MST", | ||
| "America/Yellowknife", "MST", | ||
| "America/Vancouver", "PST", | ||
| "Canada/Pacific", "PST"); |
There was a problem hiding this comment.
Let's add a comment mentioning that, as of CLDR v48.2, CLDR provides short names for these zones with explicit DST offsets.
| } | ||
|
|
||
| // Some zones use CLDR short names even when the tzdata FORMAT changed. | ||
| if (locale.equals(Locale.US) && !inDST) { |
There was a problem hiding this comment.
The test only verifies names in the US locale, so this locale check isn't needed.
| {CASABLANCA, LocalDate.of(2038, 9, 27), 0, false}, | ||
| {CASABLANCA, LocalDate.of(2038, 11, 1), ONE_HOUR, true}, | ||
| {CASABLANCA, LocalDate.of(2087, 3, 31), 0, false}, | ||
| {CASABLANCA, LocalDate.of(2087, 5, 12), ONE_HOUR, true}, |
There was a problem hiding this comment.
Same comment as in TestZoneRules applies here
This updates the JDK time zone data from
tzdata2026btotzdata2026c.The main tzdata changes included here are:
CSTabbreviation after the temporary CLDR workaround period.TimeZoneDatatest data is regenerated fortzdata2026c.The tests were adjusted where previous expectations depended on old tzdata behavior or assumed tzdata abbreviations and localized CLDR names would always match:
NegativeDSTTest.javaandTestZoneRules.javano longer expect Morocco negative-DST transitions after the 2026 move to permanent UTC.Bug6329116.javaallows the known CLDR localized short-name mismatch for Edmonton/Vancouver and their aliases.TestZoneTextPrinterParser.javarestricts daylight-name expectations to zones with explicit CLDR DST-offset metadata, avoiding a falseMountain Daylight Timeexpectation forAmerica/Yellowknife.All changed tests, plus tier1, tier2, and tier3 validation, passed.
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/32240/head:pull/32240$ git checkout pull/32240Update a local copy of the PR:
$ git checkout pull/32240$ git pull https://git.openjdk.org/jdk.git pull/32240/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 32240View PR using the GUI difftool:
$ git pr show -t 32240Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/32240.diff
Using Webrev
Link to Webrev Comment