Skip to content

8352097: (tz) zone.tab update missed in 2025a backport #101

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

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Mar 26, 2025

As with openjdk/jdk21u#460 & openjdk/jdk17u#405, the 11u backport of the tzdata 2025a update missed an update to zone.tab, as this was not present in the 25u commit on which it was originally based, due to its removal in JDK-8166983. The change was in the 24u commit which was applied later than the 21u one.

We should add this missing change to the existing 2025a update in 11.0.27 and consider backporting JDK-8166983 for 11.0.28 (now proposed for 24 in openjdk/jdk24u#150).

Backport from 17u is clean. Tests pass:

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/java/text/Format                      90    90     0     0   
   jtreg:test/jdk/java/util/TimeZone                    25    25     0     0   
   jtreg:test/jdk/sun/util/calendar                      5     5     0     0   
   jtreg:test/jdk/sun/util/resources                    21    21     0     0   
   jtreg:test/jdk/java/time                            180   180     0     0   
==============================
TEST SUCCESS

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8352097 needs maintainer approval

Issue

  • JDK-8352097: (tz) zone.tab update missed in 2025a backport (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 101

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u/pull/101.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 26, 2025

👋 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
Copy link

openjdk bot commented Mar 26, 2025

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

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

8352097: (tz) zone.tab update missed in 2025a backport

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 changed the title Backport 305512ccc6bc87afe972781e6953c4517a365f86 8352097: (tz) zone.tab update missed in 2025a backport Mar 26, 2025
@openjdk
Copy link

openjdk bot commented Mar 26, 2025

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

@openjdk
Copy link

openjdk bot commented Mar 26, 2025

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 26, 2025
@gnu-andrew
Copy link
Member Author

/approval request Follow-up fix to the tzdata 2025a backport to include a change to a file no longer present in OpenJDK 25, but patched in OpenJDK 24. Tests on java/text/Format, java/util/TimeZone, sun/util/calendar, sun/util/resources & java/time all pass.

@openjdk
Copy link

openjdk bot commented Mar 26, 2025

@gnu-andrew
8352097: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Mar 26, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 26, 2025

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Mar 26, 2025
@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 26, 2025

Going to push as commit 13dab16.

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

openjdk bot commented Mar 26, 2025

@gnu-andrew Pushed as commit 13dab16.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant