Skip to content

8390388: Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier - #766

Open
jerboaa wants to merge 7 commits into
openjdk:pr/757from
jerboaa:jdk-8390388-jdk25u-backport
Open

8390388: Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier#766
jerboaa wants to merge 7 commits into
openjdk:pr/757from
jerboaa:jdk-8390388-jdk25u-backport

Conversation

@jerboaa

@jerboaa jerboaa commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

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:

  1. metaZones.xml changes from Update CLDR to Version 48.2 JDK-8371842 as well as changes to TestZoneTextPrinterParser.java so as to avoid the test failure for America/Vancouver when run. See first and third commit.
  2. Pick dstOffset and stdOffset changes from Update CLDR to Version 48.0 JDK-8354548 in ldmlSupplemental.dtd. Added relevant hunks from ldmlSupplemental.xsd to keep them aligned. See second commit.

Testing:

  • test/jdk/sun/util/resources, test/jdk/java/time/test and test/jdk/java/util/TimeZone on Linux x86_64. All pass:
==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR  SKIP   
   jtreg:test/jdk/sun/util/resources                    22    22     0     0     0   
   jtreg:test/jdk/java/time/test                        80    80     0     0     0   
   jtreg:test/jdk/java/util/TimeZone                    28    25     0     0     3   
==============================
TEST SUCCESS
  • GHA

This is in preparation to apply JDK-8390380 next in prep for the tzdata2026c update.

Thoughts?



Progress

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

Integration blocker

 ⚠️ Dependency #757 must be integrated first

Issue

  • JDK-8390388: Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier (Bug - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 766

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper

bridgekeeper Bot commented Aug 27, 2026

Copy link
Copy Markdown

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/757 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 27, 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 JDK-8390388 8390388: Cherry-pick tz attributes from newer CLDR data for jdk25u and earlier Aug 27, 2026
@openjdk

openjdk Bot commented Aug 27, 2026

Copy link
Copy Markdown

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 Backport <hash>.

@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 27, 2026
@mlbridge

mlbridge Bot commented Aug 27, 2026

Copy link
Copy Markdown

Webrevs

@jerboaa

jerboaa commented Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

@gnu-andrew @GoeLin Please review! Thanks.

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

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?

@jerboaa

jerboaa commented Aug 28, 2026

Copy link
Copy Markdown
Contributor Author

Do you know why three of the tests were skipped?

Jtreg printed did not match keywords: 1; did not meet platform requirements: 2. And indeed DefaultTimeZoneTest.java is a manual test for windows (the keword mismatched test), Bug8066652Run.java is a test for mac only and AIXTzMappingTest.java is for AIX only.

@jerboaa

jerboaa commented Aug 28, 2026

Copy link
Copy Markdown
Contributor Author

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.

OK. Done in 71ebe9f and 1c34477 (whitespace). More thoughts?

@gnu-andrew

Copy link
Copy Markdown
Member

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.

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 master.

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.

2 participants