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

[gnu-andrew]

The 21u 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 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 21.0.7 and consider backporting JDK-8166983 for 21.0.8.

---

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-8352097 needs maintainer approval

Issue

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

Reviewers

• Sergey Bylokhov (@mrserb - Reviewer)
• Dmitry Cherepanov (@dimitryc - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 460

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/460.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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]

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

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

Reviewed-by: serb, dcherepanov

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.

[mlbridge]

Webrevs

• 00: Full (8a566368)

[openjdk]

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

[jerboaa]

Could we establish whether or not this omission is something we need to fix first? Sorry for the ignorance, but it appears to be some file being used only for generating javadoc in test code?

[gnu-andrew]

Could we establish whether or not this omission is something we need to fix first? Sorry for the ignorance, but it appears to be some file being used only for generating javadoc in test code?

I tend to agree that the file is mostly unused, but I don't think that a regression fix a week away from development freeze is the right place to be doing the removal. It seems safer to fix this missed change in the upcoming releases (putting us back in sync with 24.0.1) and attempt to remove it across all update releases (24u first) for July (that's what JDK-8166983 is; sorry if I didn't make this explicit).

Equally, I would rather not leave an out-of-sync file in the upcoming releases for the sake of a one-line patch.

[jerboaa]

/approve yes

Fair enough. This is low risk anyway.

[jerboaa]

Please apply for approval.

[openjdk]

@jerboaa
8352097: There is no maintainer approval request for this issue.

[gnu-andrew]

/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]

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

[gnu-andrew]

Please apply for approval.

Yes, I was in the process of doing so and realised I never ran the tests. Done now:

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/java/text/Format                     112   112     0     0   
   jtreg:test/jdk/java/util/TimeZone                    26    26     0     0   
   jtreg:test/jdk/sun/util/calendar                      5     5     0     0   
   jtreg:test/jdk/sun/util/resources                    22    22     0     0   
   jtreg:test/jdk/java/time                            188   188     0     0   
==============================
TEST SUCCESS

[jerboaa]

/approve yes

[openjdk]

@jerboaa
8352097: The approval request has been approved.

[gnu-andrew]

/integrate

[openjdk]

Going to push as commit 4d3a3c0.

[openjdk]

@gnu-andrew Pushed as commit 4d3a3c0.

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