Skip to content

Conversation

@gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Nov 30, 2022

Update to the latest tzdata, 2022g.

Primary changes:

  • America/Ojinaga (CST) is split, creating America/Ciudad_Juarez (MST/MDT)
  • America/Pangnirtung becomes a link to America/Iqaluit
  • America/Ojinaga gains DST (CDT)

See bug for the full details.

There will likely also be CLDR changes (CLDR-16181) that are not yet included in this change. We can either wait for these and include them in this patch, or do a separate change like JDK-8296715

Tests in java/util/TimeZone, java/time/test and sun/text/resources all pass.


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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11438

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 30, 2022

👋 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 openjdk bot added the rfr Pull request is ready for review label Nov 30, 2022
@openjdk
Copy link

openjdk bot commented Nov 30, 2022

@gnu-andrew 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 Nov 30, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 30, 2022

Webrevs

@satoyoshiki
Copy link

The following files need to be updated with the timezone data version.
src/java.base/share/data/tzdata/VERSION
test/jdk/java/util/TimeZone/TimeZoneData/VERSION

@naotoj
Copy link
Member

naotoj commented Dec 3, 2022

Hi Andrew,
Thanks for taking on this. I think you can cherry-pick the relevant CLDR changes (under common directory) into this PR so that backporting would be easier.

@gnu-andrew
Copy link
Member Author

The following files need to be updated with the timezone data version. src/java.base/share/data/tzdata/VERSION test/jdk/java/util/TimeZone/TimeZoneData/VERSION

Good catch. I copied over the files from the tzdb bundle, but it seems they have version while we have VERSION. Fixed now.

@gnu-andrew
Copy link
Member Author

Hi Andrew, Thanks for taking on this. I think you can cherry-pick the relevant CLDR changes (under common directory) into this PR so that backporting would be easier.

Good to see CLDR included them in good time. Now in this patch.

@naotoj
Copy link
Member

naotoj commented Dec 5, 2022

Have you run tests under sun.util.calendar? Tests like TestZoneInfo310.java sometimes fail with tzdata updates.

@gnu-andrew
Copy link
Member Author

Have you run tests under sun.util.calendar? Tests like TestZoneInfo310.java sometimes fail with tzdata updates.

Yes

Passed: sun/util/calendar/zi/Beyond2037.java
Passed: sun/util/calendar/zi/TestZoneInfo310.java
Passed: sun/util/calendar/Bug6653944.java
Passed: sun/util/calendar/Bug8176160.java
Passed: sun/util/calendar/CalendarSystemDeadLockTest.java

sun/util and java/util are also in jdk_util_other which is covered by tier1_part2 in the PR checks: https://github.com/gnu-andrew/jdk/actions/runs/3621042294/jobs/6104922328#step:9:5925

Only java.time and sun.text are not covered by the PR (tier2_part2)

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.

Thanks for confirming. Looks good to me.

@openjdk
Copy link

openjdk bot commented Dec 6, 2022

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

8297804: (tz) Update Timezone Data to 2022g

Reviewed-by: naoto

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

  • 203251f: 8297379: Enable the ByteBuffer path of Poly1305 optimizations
  • 1e46832: 8297602: Compiler crash with type annotation and generic record during pattern matching
  • b0e5432: 8297687: new URI(S,S,S,S) throws exception with incorrect index position reported in the error message
  • 2243646: 8298145: Remove ContiguousSpace::capacity
  • 84b927a: 8296024: Usage of DirectBuffer::address should be guarded
  • a9e6c62: 8297186: G1 triggers unnecessary full GCs when heap utilization is low
  • 4458de9: 8297172: Fix some issues of auto-vectorization of Long.bitCount/numberOfTrailingZeros/numberOfLeadingZeros()
  • a613998: 8297689: Fix incorrect result of Short.reverseBytes() call in loops
  • f8f4630: 8297963: Partially fix string expansion issues in UTIL_DEFUN_NAMED and related macros
  • 2a243a3: 8267617: Certificate's IP x509 NameConstraints raises ArrayIndexOutOfBoundsException
  • ... and 103 more: https://git.openjdk.org/jdk/compare/a1f4db55c517143f8dbf448c21448a08de3cbdd8...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 6, 2022
@gnu-andrew
Copy link
Member Author

Thanks.

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2022

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

  • 62baff5: 8298221: Problem list gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java on macosx-aarch64
  • 16a5901: 8298214: ProblemList java/util/concurrent/forkjoin/AsyncShutdownNow.java
  • b4da0ee: 8296507: GCM using more memory than necessary with in-place operations
  • cd2182a: 8295724: VirtualMachineError: Out of space in CodeCache for method handle intrinsic
  • 2cdc019: 8298178: Update to use jtreg 7.1.1
  • 79d163d: 8293412: Remove unnecessary java.security.egd overrides
  • ea83cb9: 8297450: ScaledTextFieldBorderTest.java fails when run with -show parameter
  • 336d230: 8297958: NMT: Display peak values
  • 0d2a9ee: 8298142: Update internal comment on language features in SourceVersion
  • 203251f: 8297379: Enable the ByteBuffer path of Poly1305 optimizations
  • ... and 112 more: https://git.openjdk.org/jdk/compare/a1f4db55c517143f8dbf448c21448a08de3cbdd8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 7, 2022

@gnu-andrew Pushed as commit ce89673.

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

3 participants