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

8339637: (tz) Update Timezone Data to 2024b #21265

Closed
wants to merge 4 commits into from

Conversation

johnyjose30
Copy link
Contributor

@johnyjose30 johnyjose30 commented Sep 30, 2024

Timezone data 2024b changes


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Change requires CSR request JDK-8340138 to be approved
  • Commit message must refer to an issue

Issues

  • JDK-8339637: (tz) Update Timezone Data to 2024b (Enhancement - P3)
  • JDK-8340138: (tz) Update Timezone Data to 2024b (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21265

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21265.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2024

👋 Welcome back johnyjose30! 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.

@johnyjose30
Copy link
Contributor Author

/reviewer credit @coffeys @naotoj

@openjdk
Copy link

openjdk bot commented Sep 30, 2024

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

8339637: (tz) Update Timezone Data to 2024b

Reviewed-by: naoto, coffeys, jlu

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 310 new commits pushed to the master branch:

  • 6d7e679: 8340790: Open source several AWT Dialog tests - Batch 4
  • 86ce19e: 8341142: Maintain a single source file for sun.net.www.protocol.jar.JarFileFactory
  • b9cabbe: 8341997: Tests create files in src tree instead of scratch dir
  • 5eae20f: 8323672: Suppress unwanted autoconf added flags in CC and CXX
  • 6ed6dff: 8341871: Disable G1 for unsupported platforms after JDK-8334060
  • 54c9348: 8336103: Clean up confusing Method::is_initializer
  • 2c0c653: 8342044: Increase timeout of gc/shenandoah/oom/TestClassLoaderLeak.java
  • df7d6e0: 8338603: DiagnosticCommandMBean operations should standardize types for parameters
  • c9a536c: 8337339: gc/arguments/Test*SizeFlags.java timing out with Xcomp
  • f4dccfd: 8338596: Clarify handling of restricted and caller-sensitive methods
  • ... and 300 more: https://git.openjdk.org/jdk/compare/44024826e52373d1613ec366e3f5a9d5bbaefa41...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@justin-curtis-lu, @naotoj) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 30, 2024
@openjdk
Copy link

openjdk bot commented Sep 30, 2024

@johnyjose30
Reviewer coffeys successfully credited.

Reviewer naoto successfully credited.

@openjdk
Copy link

openjdk bot commented Sep 30, 2024

@johnyjose30 The following labels will be automatically applied to this pull request:

  • core-libs
  • i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Sep 30, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2024

Webrevs

* later, where 'EST', 'MST' and 'HST' map to IDs which do not include daylight
* savings.
* savings since 1970.
Copy link
Member

Choose a reason for hiding this comment

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

Hi Johny, the future flexibility clause seems to be missing in the spec update of ZoneId.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the changes in c323844.

Can we also add the following to the ZoneId specification,

Suggested change
* savings since 1970.
* savings since 1970. This mapping may change in update releases in support of new versions of TZDB.

}
aliases.put("HST", "Pacific/Honolulu");
Copy link
Member

Choose a reason for hiding this comment

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

Looks correct to me, since "HST" to "Pacific/Honolulu" link is same for USE_OLDMAPPING as well as 2024b update.

@@ -186,15 +186,12 @@ public abstract sealed class ZoneId implements Serializable permits ZoneOffset,
* This map allows the IDs to continue to be used via the
* {@link #of(String, Map)} factory method.
* <p>
* This map contains a mapping of the IDs that is in line with TZDB 2005r and
Copy link
Member

Choose a reason for hiding this comment

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

I believe this file needs a copyright year bump.

@@ -35,7 +35,6 @@
public class Bug4848242 {
Copy link
Member

Choose a reason for hiding this comment

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

This test needs a copyright year bump. (Applies to any other tests as well).

We also might want to update the summary, since it should no longer display MET and MEST, but rather CET and CEST.


if (l1.equals(l2)) {
System.out.println("no diff");
Copy link
Member

Choose a reason for hiding this comment

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

Is this needed? IIUC diff is only called if the array contents are not equal.

Copy link
Member

Choose a reason for hiding this comment

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

Since diff is a generic debug function, equality check needed to be in the function itself. Anyway, I wrote this code for purely debug purpose, so can be removed altogether.

Copy link
Member

@justin-curtis-lu justin-curtis-lu left a comment

Choose a reason for hiding this comment

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

Besides small comment, looks correct to me, thanks for the changes.

@@ -279,6 +279,4 @@ private static ZoneInfoOld toZoneInfoOld(TimeZone tz) throws Exception {
(int[])simpleTimeZoneParams.get(tz),
willGMTOffsetChange.getBoolean(tz));
}

Copy link
Member

Choose a reason for hiding this comment

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

Patch will be cleaner if we remove the line change (L 282-283) as well.

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 14, 2024
@johnyjose30
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 16, 2024
@openjdk
Copy link

openjdk bot commented Oct 16, 2024

@johnyjose30
Your change (at version a6aac06) is now ready to be sponsored by a Committer.

@coffeys
Copy link
Contributor

coffeys commented Oct 16, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 16, 2024

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

  • e7cf25c: 8340801: Disable ubsan checks in some awt/2d coding
  • 577babf: 8334010: VM crashes with ObjectAlignmentInBytes > GCCardSizeInBytes
  • b9b0bd0: 8337221: CompileFramework: test library to conveniently compile java and jasm sources for fuzzing
  • 724de68: 8342081: Shenandoah: Remove extra ShenandoahMarkUpdateRefsSuperClosure
  • e4ff553: 8341931: os_linux gtest uses lambdas with explicit capture lists
  • e94e3bb: 8324672: Update jdk/java/time/tck/java/time/TCKInstant.java now() to be more robust
  • 6d7e679: 8340790: Open source several AWT Dialog tests - Batch 4
  • 86ce19e: 8341142: Maintain a single source file for sun.net.www.protocol.jar.JarFileFactory
  • b9cabbe: 8341997: Tests create files in src tree instead of scratch dir
  • 5eae20f: 8323672: Suppress unwanted autoconf added flags in CC and CXX
  • ... and 306 more: https://git.openjdk.org/jdk/compare/44024826e52373d1613ec366e3f5a9d5bbaefa41...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 16, 2024
@openjdk openjdk bot closed this Oct 16, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 16, 2024
@openjdk
Copy link

openjdk bot commented Oct 16, 2024

@coffeys @johnyjose30 Pushed as commit ebc17c7.

💡 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
core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants