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

8339644: Improve parsing of Day/Month in tzdata rules #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

dimitryc
Copy link
Contributor

@dimitryc dimitryc commented Dec 10, 2024

The backport is a prerequisite for timezone data update to 2024b. Targeting the PR to jdk8u repo (January release).

The change doesn’t apply cleanly. In JDK9, JDK-8042369 rewrote the builder classes but it’s too large to backport to 8u so I adopted 11u backport for 8u codebase. The test change applies cleanly after path reshuffling except copyright year.

Testing: jtreg tests (java/text/Format java/util/TimeZone sun/util/calendar sun/util/resources). Sanity checked that tzdata-2024b (rearguard version) fails to build (“Unknown month: April”) without the changes and builds with the changes.

Thanks.


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
  • JDK-8339644 needs maintainer approval

Issue

  • JDK-8339644: Improve parsing of Day/Month in tzdata rules (Bug - P4 - Requested)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 64

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u/pull/64.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 10, 2024

👋 Welcome back dcherepanov! 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
Copy link

openjdk bot commented Dec 10, 2024

❗ 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 86a2f9c7dcb6585cabf03c0940511d11560e85b7 8339644: Improve parsing of Day/Month in tzdata rules Dec 10, 2024
@openjdk
Copy link

openjdk bot commented Dec 10, 2024

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 Dec 10, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 10, 2024

Webrevs

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Thanks for looking into this. JDK-8042369 is a nasty change, because it combines two things; the dependency removal and improvements to the compiler. The dependency removal is a no go for 8u as it would break the build with JDK 7. I'll try and look into whether the compiler changes can be backported in the new year, but this minimal change looks good to me and is appropriate for getting this fixed in the near term.

Do you plan to also get 2024b into 8u442? There is only a week left before the freeze and I doubt many people will be around next week - myself included - but I can try and keep an eye out if you plan to submit it. I'm still happy for this to go in as it will enable people to use 2024b with 8u442 manually.

@openjdk
Copy link

openjdk bot commented Dec 20, 2024

⚠️ @dimitryc This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@dimitryc
Copy link
Contributor Author

/approval request Required fix for upcoming tz updates. All relevant tests passed.

@openjdk
Copy link

openjdk bot commented Dec 23, 2024

@dimitryc
8339644: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Dec 23, 2024
@dimitryc
Copy link
Contributor Author

Thanks for reviewing this. Added approval request to this bug.

Yes, I plan to backport 2024b to 8u442 and there are two other changes (JDK-8339803 and JDK-8340552) that makes sense to consider for inclusion in 8u442. I'll try to prepare PRs today or tomorrow.

@gnu-andrew
Copy link
Member

I'm afraid we need to move this to https://github.com/openjdk/jdk8u-dev as 8u442 is now frozen. Sorry we couldn't get it into this release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval backport rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

2 participants