8390388: Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier - #766
8390388: Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier#766jerboaa wants to merge 7 commits into
Conversation
|
👋 Welcome back sgehwolf! 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 the original issue, but not the original commit. If you have the original commit hash, please update the pull request title with |
Webrevs
|
|
@gnu-andrew @GoeLin Please review! Thanks. |
gnu-andrew
left a comment
There was a problem hiding this comment.
I would add the other dstOffset metazone additions from CLDR 48 so the attribute is used consistently with later JDKs:
$ git show 2c3c4707c0ac|grep dstOffset
+<!ATTLIST usesMetazone dstOffset CDATA #IMPLIED >
+ <xs:attribute name="dstOffset"/>
+ <usesMetazone to="2017-10-23 22:00" from="1994-03-20 22:00" mzone="Africa_Western" stdOffset="+01" dstOffset="+02"/>
+ <usesMetazone mzone="Irish" to="1971-10-31 02:00" stdOffset="+00" dstOffset="+01"/>
+ <usesMetazone mzone="GMT" from="1971-10-31 02:00" stdOffset="+00" dstOffset="+01"/>
I also don't see the need for bringing in the blank lines above plurals. It's not like this will make the files match as there are other schema changes we don't want to bring in.
The 48.2 changes look fine. Do you know why three of the tests were skipped?
Jtreg printed |
OK. Done in 71ebe9f and 1c34477 (whitespace). More thoughts? |
Change look ok. I'll do a final review once #757 is in and this is rebased on |
01431d1 to
454056f
Compare
Using
Backport <bug>because the bug exists, but no public sha to compare it to. This patch implements the described changes in the bug. In particular takes:metaZones.xmlchanges fromUpdate CLDR to Version 48.2JDK-8371842 as well as changes toTestZoneTextPrinterParser.javaso as to avoid the test failure forAmerica/Vancouverwhen run. See first and third commit.dstOffsetandstdOffsetchanges fromUpdate CLDR to Version 48.0JDK-8354548 inldmlSupplemental.dtd. Added relevant hunks fromldmlSupplemental.xsdto keep them aligned. See second commit.Testing:
test/jdk/sun/util/resources,test/jdk/java/time/testandtest/jdk/java/util/TimeZoneon Linux x86_64. All pass:This is in preparation to apply JDK-8390380 next in prep for the
tzdata2026cupdate.Thoughts?
Progress
Integration blocker
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/766/head:pull/766$ git checkout pull/766Update a local copy of the PR:
$ git checkout pull/766$ git pull https://git.openjdk.org/jdk25u-dev.git pull/766/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 766View PR using the GUI difftool:
$ git pr show -t 766Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/766.diff
Using Webrev
Link to Webrev Comment