Skip to content

8381379: Support std/dstOffset attributes in CLDR's metazone definitions - #757

Open
gnu-andrew wants to merge 1 commit into
openjdk:masterfrom
gnu-andrew:JDK-8381379-25u
Open

8381379: Support std/dstOffset attributes in CLDR's metazone definitions#757
gnu-andrew wants to merge 1 commit into
openjdk:masterfrom
gnu-andrew:JDK-8381379-25u

Conversation

@gnu-andrew

@gnu-andrew gnu-andrew commented Aug 26, 2026

Copy link
Copy Markdown
Member

This backports support for the dstOffset attribute to the CLDR converter, which is necessary to support new timezone changes in Vancouver (tzdata2026b) and Alberta (tzdata2026c) correctly.

As there are no dstOffset attributes currently in the CLDR data in 25u (version 47), this doesn't yet do much. The test for it will be writing a fix for JDK-8390388: "Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier" which doesn't exist for 27 as it has the newer CLDR with dstOffset.

I actually thought the TimeZoneNamesTest.java changes here might fail without first having the attributes, but this was not the case. So this and its dependency #756 should be able to go in nearly clean and then we get to the more tricky but interesting part. The test passes because of:

+            // This needs to change once TZDB adopts -7 offset year round, and CLDR uses explicit dst offset
+            // namely, "Pacific Standard Time" -> "Pacific Daylight Time"
+            Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Standard Time")

which is changed in JDK-8371842: Update CLDR to Version 48.2, which we'll need to backport hunks of for JDK-8390388. With that change & tzdata 2026b (already in 25u), Vancouver should still be reporting "Pacific Daylight Time" in December.

The only adjustments were the copyright header on DateTimeFormatterBuilder.java and the bug ID placement on test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java, due to 8382020 & 8384043 going in first for the last tzdata update. As it stands, all tests pass as on the previous PR:

$ make -C $HOME/builder/25u-dev run-test TEST="jdk/sun/util/resources"
...
==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR  SKIP   
   jtreg:test/jdk/sun/util/resources                    22    22     0     0     0   
==============================
TEST SUCCESS


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8381379 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8381379: Support std/dstOffset attributes in CLDR's metazone definitions (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 757

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper

bridgekeeper Bot commented Aug 26, 2026

Copy link
Copy Markdown

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into pr/756 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 commented Aug 26, 2026

Copy link
Copy Markdown

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk Bot changed the title Backport 13633c0825cc44e7a40b652b3c70334d1cfa621e 8381379: Support std/dstOffset attributes in CLDR's metazone definitions Aug 26, 2026
@openjdk

openjdk Bot commented Aug 26, 2026

Copy link
Copy Markdown

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk Bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 26, 2026
@mlbridge

mlbridge Bot commented Aug 26, 2026

Copy link
Copy Markdown

Webrevs

@GoeLin GoeLin left a comment

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.

LGTM
Yes, only minor changes.
I ran it through our nightly testing which is green, but as stated it's probably not really tested as not yet used.

@jerboaa jerboaa left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks OK.

@openjdk-notifier
openjdk-notifier Bot changed the base branch from pr/756 to master August 28, 2026 16:03
@openjdk-notifier

Copy link
Copy Markdown

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8381379-25u
git fetch https://git.openjdk.org/jdk25u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk

openjdk Bot commented Aug 28, 2026

Copy link
Copy Markdown

⚠️ @gnu-andrew 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.

@openjdk

openjdk Bot commented Aug 28, 2026

Copy link
Copy Markdown

@gnu-andrew Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@gnu-andrew

Copy link
Copy Markdown
Member Author

Just waiting on re-reviews but patch should be identical to before (git just dropped the dependency commit that has been rebased and pushed upstream by Skara)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants