Skip to content

8390380: Cherry-pick metazone changes from CLDR to support tzdata2026c for JDK update releases #767

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.

Sign up for GitHub

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

Closed
jerboaa wants to merge 1 commit into from
+7 −4
Closed

8390380: Cherry-pick metazone changes from CLDR to support tzdata2026c for JDK update releases #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion make/data/cldr/common/supplemental/metaZones.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/>
<usesMetazone to="1985-12-31 23:00" from="1984-03-16 00:00" mzone="Europe_Central"/>
<usesMetazone to="2018-10-28 02:00" from="1985-12-31 23:00" mzone="Europe_Western"/>
<usesMetazone from="2026-09-20 01:00" mzone="Europe_Western"/>
</timezone>
<timezone type="Africa/Ceuta">
<usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/>
Expand All @@ -80,6 +81,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<timezone type="Africa/El_Aaiun">
<usesMetazone to="1976-04-14 01:00" mzone="Africa_FarWestern"/>
<usesMetazone to="2018-10-28 02:00" from="1976-04-14 01:00" mzone="Europe_Western"/>
<usesMetazone from="2026-09-20 01:00" mzone="Europe_Western"/>
</timezone>
<timezone type="Africa/Freetown">
<usesMetazone mzone="GMT"/>
Expand Down Expand Up @@ -382,7 +384,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<usesMetazone mzone="Atlantic"/>
</timezone>
<timezone type="America/Edmonton">
<usesMetazone mzone="America_Mountain"/>
<usesMetazone mzone="America_Mountain" stdOffset="-07" dstOffset="-06"/>
</timezone>
<timezone type="America/Eirunepe">
<usesMetazone to="2008-06-24 05:00" mzone="Acre"/>
Expand Down
7 changes: 4 additions & 3 deletions test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
/*
* @test
* @bug 8181157 8202537 8234347 8236548 8261279 8322647 8174269 8346948
* 8381379 8382020 8384043 8390388
* 8381379 8382020 8384043
* 8381379 8382020 8384043 8390388 8390380

@jerboaa jerboaa Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Apparently #766 introduced a second line (27) instead of modifying the existing one, 28, last changed with #757. This merges the lines again. Sorry about that.

@gnu-andrew gnu-andrew Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This wasn't in the original version I reviewed, but introduced by the merge: 89689e8 and I also missed it when rechecking this morning.

@gnu-andrew gnu-andrew Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Original version: 0336efc

* @modules jdk.localedata
* @summary Checks CLDR time zone names are generated correctly at
* either build or runtime
Expand Down Expand Up @@ -277,7 +276,9 @@ private static Stream<Arguments> explicitDstOffsets() {
Arguments.of(ZonedDateTime.of(2026, 4, 5, 0, 0, 0, 0, ZoneId.of("Eire")), "Irish Standard Time"),
Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("Eire")), "Greenwich Mean Time"),
Arguments.of(ZonedDateTime.of(2026, 4, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Daylight Time"),
Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Daylight Time")
Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Daylight Time"),
Arguments.of(ZonedDateTime.of(2026, 1, 5, 0, 0, 0, 0, ZoneId.of("America/Edmonton")), "Mountain Standard Time"),
Arguments.of(ZonedDateTime.of(2026, 7, 5, 0, 0, 0, 0, ZoneId.of("America/Edmonton")), "Mountain Daylight Time")
);
}

Expand Down