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 #752

Closed
wants to merge 2 commits into from

Conversation

gnu-andrew
Copy link
Member

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

Moving this here from openjdk/jdk17u#355 as I guess this missed review before freeze. Do we need more people actively monitoring 17u during the rampdown period?

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.

It differs from the 19u version in that 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.

The test fails with 17.0.4 (using system tzdata 2022c) 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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 752

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 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 changed the title Backport e10231248fc100f9dfa08468ac897f60b843857f 8293834: Update CLDR data following tzdata 2022c update Sep 28, 2022
@openjdk
Copy link

openjdk bot commented Sep 28, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Sep 28, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 28, 2022

Webrevs

@gnu-andrew
Copy link
Member Author

Ping?

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Oct 31, 2022

@gnu-andrew This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8293834: Update CLDR data following tzdata 2022c update

Reviewed-by: phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 107 new commits pushed to the master branch:

  • d5fedc5: 8244670: convert clhsdb "whatis" command from javascript to java
  • 5fa5392: 8273578: javax/swing/JMenu/4515762/bug4515762.java fails on macOS 12
  • 0698930: 8295288: Some vm_flags tests associate with a wrong BugID
  • 9fd15d5: 8233648: [TESTBUG] DefaultMenuBarTest.java failing on macos
  • 6a45f75: 8280948: Write a regression test for JDK-4659800
  • aa98d09: 8291456: com/sun/jdi/ClassUnloadEventTest.java failed with: Wrong number of class unload events: expected 10 got 4
  • 9732004: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
  • 8194120: 8292880: Improve debuggee logging for com/sun/jdi/ClassUnloadEventTest.java
  • 5977ce5: 8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
  • ba2f0b4: 8291650: Add delay to ClassUnloadEventTest before exiting to give time for JVM to send all events before VMDeath
  • ... and 97 more: https://git.openjdk.org/jdk17u-dev/compare/14d7e3ce293514caa8921235b4fd891b2e7e0146...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 31, 2022
@gnu-andrew
Copy link
Member Author

Ping?

Lgtm.

Thanks Paul. Flagged for approval.

@GoeLin
Copy link
Member

GoeLin commented Nov 16, 2022

Hi @gnu-andrew, this is ready to be pushed, isn't it?

@gnu-andrew
Copy link
Member Author

Now I see jdk17u-fix-yes, yes :)

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 17, 2022

Going to push as commit 52103da.
Since your change was applied there have been 144 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 17, 2022
@openjdk openjdk bot closed this Nov 17, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 17, 2022
@openjdk
Copy link

openjdk bot commented Nov 17, 2022

@gnu-andrew Pushed as commit 52103da.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants