Skip to content
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.

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

8293834: Update CLDR data following tzdata 2022c update #355

Closed
wants to merge 2 commits into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Sep 24, 2022

This patch updates the CLDR data following the tzdata bump in JDK-8292579.

This will be handled in trunk by a larger update to CLDRv42.

This patch was reviewed in an earlier form in 19u - https://git.openjdk.org/jdk19u/pull/26 - but I'm still waiting for this to be approved. I'm thus submitting this as a new patch to 17u to try and get it in before we freeze for the next release.

A couple of modifications from the 19u version:

  • We also bring in a change from the CLDR v41 update (JDK-8265315) to use "Kyiv" rather than "Kiev" as the zone description. This change is already in 19u.
  • We add Europe/Kyiv to the existing testcase test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java

The test fails with 17.0.4 as follows:

$ grep 'AssertionError' test.1663972846/jdk/JTwork/sun/util/resources/cldr/TimeZoneNamesTest.jtr 
java.lang.AssertionError: expected [Eastern European Standard Time] but found [Kyiv Standard Time]
java.lang.AssertionError: expected [heure normale d\u2019Europe de l\u2019Est] but found [Kyiv (heure standard)]
java.lang.AssertionError: expected [Osteurop\u00e4ische Normalzeit] but found [Kyiv Normalzeit]

and passes with the patched build.


Progress

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

Issue

  • JDK-8293834: Update CLDR data following tzdata 2022c update

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u pull/355/head:pull/355
$ git checkout pull/355

Update a local copy of the PR:
$ git checkout pull/355
$ git pull https://git.openjdk.org/jdk17u pull/355/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 355

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u/pull/355.diff

@gnu-andrew
Copy link
Member Author

I'll be updating the 19u fix to include the test change too.

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 24, 2022

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into master 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 added the rfr Pull request is ready for review label Sep 24, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 24, 2022

Webrevs

@gnu-andrew
Copy link
Member Author

Abandoning this for openjdk/jdk17u-dev#752 as 17.0.5 is now frozen.

@gnu-andrew gnu-andrew closed this Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rfr Pull request is ready for review
1 participant