From 7a93cd146c3a3cfb1492e952cfcc0a4a44909404 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Thu, 4 Nov 2021 13:13:47 -0400 Subject: [PATCH] ICU-21825 Integrate tzdata2021a4 including America/Coral_Harbour Link fix --- icu4c/source/data/misc/zoneinfo64.txt | 11 ++++++----- icu4c/source/test/intltest/tztest.cpp | 2 +- icu4j/main/shared/data/icutzdata.jar | 4 ++-- .../com/ibm/icu/dev/test/timezone/TimeZoneTest.java | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 69c9d3fc54c..28208be6230 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,9 +3,9 @@ // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Wed Oct 27 14:01:32 2021 +// Build date: Thu Nov 4 10:32:31 2021 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2021a3 +// tz version: 2021a4 // ICU version: 70.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << @@ -13,7 +13,7 @@ //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2021a3" } + TZVersion { "2021a4" } Zones:array { /* ACT */ :int { 356 } //Z#0 /* AET */ :int { 368 } //Z#1 @@ -291,6 +291,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1632067200, -1615136400, -923248800, -765392400 } typeOffsets:intvector { -21988, 0, -21600, 0, -21600, 3600, -18000, 0 } typeMap:bin { "0102010203" } + links:intvector { 79, 100 } } //Z#79 /* America/Atka */ :int { 59 } //Z#80 /* America/Bahia */ :table { @@ -396,7 +397,7 @@ zoneinfo64:table(nofallback) { finalRaw:int { -25200 } finalYear:int { 2003 } } //Z#99 - /* America/Coral_Harbour */ :int { 182 } //Z#100 + /* America/Coral_Harbour */ :int { 79 } //Z#100 /* America/Cordoba */ :int { 67 } //Z#101 /* America/Costa_Rica */ :table { trans:intvector { -1545071027, 288770400, 297234000, 320220000, 328683600, 664264800, 678344400, 695714400, 700635600 } @@ -908,7 +909,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1946918424 } typeOffsets:intvector { -19088, 0, -19176, 0, -18000, 0 } typeMap:bin { "0102" } - links:intvector { 97, 100, 182 } + links:intvector { 97, 182 } } //Z#182 /* America/Pangnirtung */ :table { trans:intvector { -1546300800, -880221600, -765399600, -147902400, -131572800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954662400, 972802800, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 0d58bab197d..8d017f67d71 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2079,7 +2079,7 @@ void TimeZoneTest::TestCanonicalID() { {"America/Antigua", "America/Port_of_Spain"}, {"America/Anguilla", "America/Port_of_Spain"}, {"America/Cayman", "America/Panama"}, - {"America/Coral_Harbour", "America/Panama"}, + {"America/Coral_Harbour", "America/Atikokan"}, {"America/Curacao", "America/Aruba"}, {"America/Dominica", "America/Port_of_Spain"}, {"America/Grenada", "America/Port_of_Spain"}, diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index bca1bf6c78f..b4c58beb7ab 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a4fff1ab7c2ec77c567b94612113c7b73ece22ba98160cac956e3cd34be3913 -size 96396 +oid sha256:d13d3b8e7c58f0e41e4b6ff6f2bfa43529de382ecf2c1e3944429b1c1a761361 +size 96439 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 0cb69f33cbd..b728625b90c 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1519,7 +1519,7 @@ public class TimeZoneTest extends TestFmwk {"America/Antigua", "America/Port_of_Spain"}, {"America/Anguilla", "America/Port_of_Spain"}, {"America/Cayman", "America/Panama"}, - {"America/Coral_Harbour", "America/Panama"}, + {"America/Coral_Harbour", "America/Atikokan"}, {"America/Curacao", "America/Aruba"}, {"America/Dominica", "America/Port_of_Spain"}, {"America/Grenada", "America/Port_of_Spain"}, -- 2.40.0