[jdk17u-dev] Integrated: 8274864: Remove Amman/Cairo hacks in ZoneInfoFile

[Andrew John Hughes]

On Wed, 12 Apr 2023 18:23:05 GMT, Andrew John Hughes <andrew at openjdk.org> wrote:

> Hi all,
> 
> This pull request contains a backport of commit [ec199072](https://github.com/openjdk/jdk/commit/ec199072c5867624d66840238cc8828e16ae8da7) from the [openjdk/jdk](https://git.openjdk.org/jdk) repository.
> 
> The commit being backported was authored by Naoto Sato on 8 Oct 2021 and was reviewed by Iris Clark and Joe Wang.
> 
> It is a pre-requisite for backporting the latest tzdata update, [JDK-8305113](https://bugs.openjdk.org/browse/JDK-8305113) and has already been backported to Oracle's 17.0.8.
> 
> Backport is clean. Tests in `java/util/TimeZone`, `java/time/test`, `sun/util/calendar`, `sun/util/resources` and `sun/text/resources` all pass.
> 
> Thanks!

This pull request has now been integrated.

Changeset: aeb7cf50
Author:    Andrew John Hughes <andrew at openjdk.org>
URL:       https://git.openjdk.org/jdk17u-dev/commit/aeb7cf503994c9ed1f227f3c0ea0704a1dc31cca
Stats:     29 lines in 1 file changed: 0 ins; 29 del; 0 mod

8274864: Remove Amman/Cairo hacks in ZoneInfoFile

Backport-of: ec199072c5867624d66840238cc8828e16ae8da7

-------------

PR: https://git.openjdk.org/jdk17u-dev/pull/1240