8381379: Support std/dstOffset attributes in CLDR's metazone definitions - #757
8381379: Support std/dstOffset attributes in CLDR's metazone definitions#757gnu-andrew wants to merge 1 commit into
Conversation
|
👋 Welcome back andrew! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
|
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
GoeLin
left a comment
There was a problem hiding this comment.
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.
|
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 |
|
|
01431d1 to
454056f
Compare
|
@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. |
|
Just waiting on re-reviews but patch should be identical to before ( |
This backports support for the
dstOffsetattribute to the CLDR converter, which is necessary to support new timezone changes in Vancouver (tzdata2026b) and Alberta (tzdata2026c) correctly.As there are no
dstOffsetattributes 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 withdstOffset.I actually thought the
TimeZoneNamesTest.javachanges 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: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.javaand the bug ID placement ontest/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:Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/757/head:pull/757$ git checkout pull/757Update a local copy of the PR:
$ git checkout pull/757$ git pull https://git.openjdk.org/jdk25u-dev.git pull/757/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 757View PR using the GUI difftool:
$ git pr show -t 757Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/757.diff
Using Webrev
Link to Webrev Comment