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

[Andrew John Hughes]

On Thu, 13 Apr 2023 01:05:53 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 11.0.20.
> 
> Backport is clean. Tests in `java/util/TimeZone`, `java/time/test`, `sun/util/calendar`, `sun/util/resources` and `sun/text/resources` show no regressions (I see `java/time/test/java/time/format/TestUTCParse.java` failing both patched and unpatched)
> 
> Thanks!

This pull request has now been integrated.

Changeset: b4caafe1
Author:    Andrew John Hughes <andrew at openjdk.org>
URL:       https://git.openjdk.org/jdk11u-dev/commit/b4caafe16f14983e303b7f1fdf3090e5c513ebd8
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/jdk11u-dev/pull/1828