Skip to content

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

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 27, 2025

As with openjdk/jdk21u#460, openjdk/jdk17u#405 & openjdk/jdk11u#101, the 8u 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 8u452 and consider backporting JDK-8166983 for 8u462 (now proposed for 24 in openjdk/jdk24u#150).

Patch from 11u applies cleanly to the make/data file when applied from the jdk subdirectory (-p1) and to the copy in test/sun/util/calendar/zi/tzdata applied from test/sun/util/calendar/zi subdirectory (-p3) .

Testing showed no regressions:

$ for suite in jdk_time jdk_text jdk_util_other; do make -C $HOME/builder/8u test TEST="${suite}"; done 2>&1 | tee ${TMPDIR}/test.log
...
$ cat ${TMPDIR}/test.log|grep '^TEST'
TEST STATS: name=jdk_time  run=170  pass=170  fail=0
TEST: java/text/BreakIterator/BreakIteratorTest.java
TEST JDK: /home/andrew/builder/8u/images/j2sdk-image
TEST RESULT: Failed. Execution failed: `main' threw exception: java.lang.RuntimeException: Uncaught exception thrown in test method TestJapaneseLineBreak
TEST STATS: name=jdk_text  run=152  pass=151  fail=1
TEST STATS: name=jdk_util_other  run=351  pass=351  fail=0

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 71

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 27, 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 27, 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

Reviewed-by: 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.

@openjdk openjdk bot changed the title Backport 13dab160c693baa33af6236792f1cf55de7318b2 8352097: (tz) zone.tab update missed in 2025a backport Mar 27, 2025
@openjdk
Copy link

openjdk bot commented Mar 27, 2025

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 Mar 27, 2025
@mlbridge
Copy link

mlbridge bot commented Mar 27, 2025

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 27, 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.

@gnu-andrew
Copy link
Member Author

Thanks Dmitry.

/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 jdk_time, jdk_text & jdk_util_other show no regression.

@openjdk
Copy link

openjdk bot commented Mar 27, 2025

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

@openjdk openjdk bot added the approval label Mar 27, 2025
@jerboaa
Copy link
Contributor

jerboaa commented Mar 27, 2025

/approve yes

@openjdk
Copy link

openjdk bot commented Mar 27, 2025

@jerboaa
8352097: The approval request has been approved.

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

/integrate

@openjdk
Copy link

openjdk bot commented Mar 27, 2025

Going to push as commit b10963f.

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

openjdk bot commented Mar 27, 2025

@gnu-andrew Pushed as commit b10963f.

💡 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
Development

Successfully merging this pull request may close these issues.

3 participants