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

8296715: CLDR v42 update for tzdata 2022f #942

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Nov 30, 2022

backport of 8296715;
avoid make/data/cldr/common/dtd/ldmlSupplemental.dtd
changes like it has been done in the 19u and 15u backports; test files need manual adjustment because of changes in the stride


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 942

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 30, 2022

👋 Welcome back mbaesken! 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 55dd90222e2cef11ebca39a2998d8f799aadbb9a 8296715: CLDR v42 update for tzdata 2022f Nov 30, 2022
@openjdk
Copy link

openjdk bot commented Nov 30, 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 Nov 30, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 30, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for backporting!

@openjdk
Copy link

openjdk bot commented Nov 30, 2022

@MBaesken 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:

8296715: CLDR v42 update for tzdata 2022f

Reviewed-by: mdoerr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Nov 30, 2022
@gnu-andrew
Copy link
Member

gnu-andrew commented Nov 30, 2022

The change looks good to me, but I think this should be a critical request for openjdk/jdk17u instead, so it makes 17.0.6 which has 2022f (17u went into rampdown yesterday: https://mail.openjdk.org/pipermail/jdk-updates-dev/2022-November/019048.html). Note that Oracle have included this in their 17.0.6.

Do you plan to handle 11u as well?

@MBaesken
Copy link
Member Author

Do you plan to handle 11u as well?

I am preparing an 11u-dev PR as well.

@gnu-andrew
Copy link
Member

Do you plan to handle 11u as well?

I am preparing an 11u-dev PR as well.

Great. Same thing, please aim for 11u so we can get this in with the tzdata 2022f change.

@MBaesken
Copy link
Member Author

MBaesken commented Dec 1, 2022

https://wiki.openjdk.org/display/JDKUpdates/JDK+17u
Tuesday, December 6 2022: Rampdown; last merge from jdk17u-dev to jdk17u - so no critical request needed.

/integrate

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

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

  • 8c0c9b4: 8296957: One more cast in SAFE_SIZE_NEW_ARRAY2
  • d982158: 8296496: Overzealous check in sizecalc.h prevents large memory allocation
  • 5b77b57: 8285093: Introduce UTIL_ARG_WITH

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 1, 2022

@MBaesken Pushed as commit 3df0e29.

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

@gnu-andrew
Copy link
Member

Do you plan to handle 11u as well?

I am preparing an 11u-dev PR as well.

Great. Same thing, please aim for 11u so we can get this in with the tzdata 2022f change.

https://wiki.openjdk.org/display/JDKUpdates/JDK+17u Tuesday, December 6 2022: Rampdown; last merge from jdk17u-dev to jdk17u - so no critical request needed.

/integrate

Ok this is strange. Why is 11u & 17u rampdown so late? 8u's was last week.

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