ICU-20398 Updated tzdata build script to use the rearguard data. Deleted local override that used to simulate rearguard version from icuzones.
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index 4266801..d81b2ea 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,7 +3,7 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Wed Jan 2 12:36:16 2019
+// Build date: Tue Feb 19 01:26:22 2019
// tz database: ftp://ftp.iana.org/tz/
// tz version: 2018i
// ICU version: 63.1
@@ -59,9 +59,9 @@
links:intvector { 3, 18, 401 }
} //Z#18
/* Africa/Casablanca */ :table {
- trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1540692000, 1557021600, 1560045600, 1587261600, 1590285600, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835229600, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080173600, 2107994400, 2111018400, 2138234400, 2141863200 }
+ trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590285600, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835229600, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080173600, 2107994400, 2111018400, 2138234400, 2141863200 }
typeOffsets:intvector { -1820, 0, 0, 0, 0, 3600, 3600, 0 }
- typeMap:bin { "0102010201020102010201020102010201030102010201020102010201020102010201020102010201020102010201020102010201020301030103010301030103010301030103010301030103010301030103010301030103010301030103" }
+ typeMap:bin { "01020102010201020102010201020102010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
} //Z#19
/* Africa/Ceuta */ :table {
transPre32:intvector { -1, 2117514496 }
@@ -78,9 +78,9 @@
/* Africa/Djibouti */ :int { 48 } //Z#24
/* Africa/Douala */ :int { 36 } //Z#25
/* Africa/El_Aaiun */ :table {
- trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1540692000, 1557021600, 1560045600, 1587261600, 1590285600, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835229600, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080173600, 2107994400, 2111018400, 2138234400, 2141863200 }
- typeOffsets:intvector { -3168, 0, -3600, 0, 0, 0, 0, 3600, 3600, 0 }
- typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030402040204020402040204020402040204020402040204020402040204020402040204020402040204" }
+ trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590285600, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835229600, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080173600, 2107994400, 2111018400, 2138234400, 2141863200 }
+ typeOffsets:intvector { -3168, 0, -3600, 0, 0, 0, 0, 3600 }
+ typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203" }
} //Z#26
/* Africa/Freetown */ :int { 5 } //Z#27
/* Africa/Gaborone */ :int { 43 } //Z#28
@@ -3113,63 +3113,60 @@
EUAsia:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600
} //_#11
- Eire:intvector {
- 9, -31, -1, 3600, 2, 2, -31, -1, 3600, 2, -3600
- } //_#12
Fiji:intvector {
10, 1, -1, 7200, 0, 0, 13, -1, 10800, 0, 3600
- } //_#13
+ } //_#12
Haiti:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#14
+ } //_#13
Iran:intvector {
2, 20, 0, 86400, 0, 8, 20, 0, 86400, 0, 3600
- } //_#15
+ } //_#14
Jordan:intvector {
2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
- } //_#16
+ } //_#15
LH:intvector {
9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
- } //_#17
+ } //_#16
Lebanon:intvector {
2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
- } //_#18
+ } //_#17
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#19
+ } //_#18
Moldova:intvector {
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
- } //_#20
+ } //_#19
NZ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
- } //_#21
+ } //_#20
Palestine:intvector {
2, 22, -7, 3600, 0, 9, -31, -7, 3600, 0, 3600
- } //_#22
+ } //_#21
Para:intvector {
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
- } //_#23
+ } //_#22
Syria:intvector {
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
- } //_#24
+ } //_#23
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#25
+ } //_#24
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#26
+ } //_#25
Troll:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
- } //_#27
+ } //_#26
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#28
+ } //_#27
WS:intvector {
8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
- } //_#29
+ } //_#28
Zion:intvector {
2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#30
+ } //_#29
}
Regions:array {
"AU", //Z#0 ACT
diff --git a/icu4c/source/tools/tzcode/Makefile.in b/icu4c/source/tools/tzcode/Makefile.in
index 63c9230..80139f7 100644
--- a/icu4c/source/tools/tzcode/Makefile.in
+++ b/icu4c/source/tools/tzcode/Makefile.in
@@ -18,6 +18,28 @@
TZCODE = $(firstword $(wildcard ./tzcode*.tar.gz) $(wildcard $(srcdir)/tzcode*.tar.gz))
endif
+
+PRIMARY_YDATA= africa antarctica asia australasia \
+ europe northamerica southamerica
+YDATA= $(PRIMARY_YDATA) pacificnew etcetera factory backward
+NDATA= systemv
+SDATA= solar87 solar88 solar89
+#TDATA= $(YDATA) $(NDATA) $(SDATA)
+TDATA= $(YDATA) $(NDATA)
+YEARISTYPE= ./yearistype
+
+TZDIR=zoneinfo
+
+CFLAGS+=-D_POSIX_C_SOURCE
+CPPFLAGS+= -DTZDIR=\"$(TZDIR)\"
+
+# more data
+XDATA=zone.tab yearistype.sh leapseconds iso3166.tab
+ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo64.txt zoneinfo.txt
+
+VANGUARD_DIR= ./vanguard
+
+# For TZ DB/ICU comparison
TZORIG=./tzorig
TZORIG_TZDIR=./tzorig/tzdir
TZORIG_ABS := $(shell pwd)/tzorig
@@ -70,6 +92,10 @@
mkdir $(TZORIG_TZDIR)
gunzip -d < $(TZDATA) | ( cd $@ ; tar xf - )
gunzip -d < $(TZCODE) | ( cd $@ ; tar xf - )
+ for tzfile in $(TDATA) ; do \
+ mv $(TZORIG)/$$tzfile $(TZORIG)/$$tzfile.bak && \
+ awk -v DATAFORM=rearguard -f $(TZORIG)/ziguard.awk $(TZORIG)/$$tzfile.bak > $(TZORIG)/$$tzfile; \
+ done
-mv $(TZORIG)/zdump.c $(TZORIG)/zdump.c.orig
cp $(srcdir)/zdump.c $(TZORIG)/zdump.c
-mv $(TZORIG)/factory $(TZORIG)/factory.orig
@@ -103,24 +129,6 @@
#
-PRIMARY_YDATA= africa antarctica asia australasia \
- europe northamerica southamerica
-YDATA= $(PRIMARY_YDATA) pacificnew etcetera factory backward
-NDATA= systemv
-SDATA= solar87 solar88 solar89
-#TDATA= $(YDATA) $(NDATA) $(SDATA)
-TDATA= $(YDATA) $(NDATA)
-YEARISTYPE= ./yearistype
-
-TZDIR=zoneinfo
-
-CFLAGS+=-D_POSIX_C_SOURCE
-CPPFLAGS+= -DTZDIR=\"$(TZDIR)\"
-
-# more data
-XDATA=zone.tab yearistype.sh leapseconds iso3166.tab
-ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo64.txt zoneinfo.txt
-
$(ZICTARG): $(OBJECTS) $(TDATA) yearistype $(srcdir)/tz2icu.h
$(CC) $(CFLAGS) $(TZORIG_EXTRA_CFLAGS) $(LFLAGS) -I$(srcdir) $(OBJECTS) $(LDLIBS) -o $@
@@ -134,7 +142,12 @@
$(TDATA): tdatamarker
tdatamarker: $(TZDATA)
+ mkdir $(VANGUARD_DIR)
gunzip -d < $(TZDATA) | tar xf - --exclude=Makefile
+ for tzfile in $(TDATA) ; do \
+ mv $$tzfile $(VANGUARD_DIR)/$$tzfile && \
+ awk -v DATAFORM=rearguard -f ziguard.awk $(VANGUARD_DIR)/$$tzfile > $$tzfile; \
+ done
touch $@
yearistype: yearistype.sh
@@ -154,10 +167,11 @@
@echo ICU specific cleanup:
-rm -f $(ICUDATA)
-rm -rf $(TZDIR)
+ -rm -rf $(VANGUARD_DIR)
-$(RMV) $(ICUZDUMPTARG) tzorig ./zdumpout/ ./icuzdumpout/
ifneq ($(TZDATA),)
-rm -rf `gunzip -d < $(TZDATA) | tar tf - --exclude=Makefile | grep -o '[^ ]*$$' | tr '\n' ' '`
- -rm tdatamarker
+ -rm -f tdatamarker
endif
checkclean:
diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones
index ce4cb54..77cf719 100644
--- a/icu4c/source/tools/tzcode/icuzones
+++ b/icu4c/source/tools/tzcode/icuzones
@@ -77,200 +77,3 @@
# ICU may also remove these aliases.
#
Link America/Regina Canada/East-Saskatchewan # removed from backward in 2017c
-
-
-# Note:
-# Following section was added for tz database 2018a and 2018b.
-# ICU has a bug handling negative DST, and we also don't want to
-# flip sumer time name and winter time name for Dublin at least for
-# now. Because the change had major impacts to tz database external
-# consumers, the tz database maintainer once reverted the Europe/Dublin
-# rules (same as 2017c or older) in 2018c. The tz database maintainer
-# thinks the changes in 2018a should be brought back when external
-# tz database consumers are ready to adopt the change. We don't know
-# what CLDR TC want to do with this for now. But if tz database brings
-# back the change, and CLDR TC (and ICU TC) want to keep the display name
-# unchanged, then we can uncomment the block below to restore ICU
-# custom override. (Yoshito 2018-01-23)
-
-#
-# tzdata2018a changed Europe/Dublin to use IST (UTC+1) as the standard time
-# of the region, and GMT (UTC) as the daylight saving time with negative
-# offset (-1 hour) in winter. ICU SimpleTimeZone rejects a zone with negative
-# daylight saving time offset. We could remove the restriction in newer version
-# of ICU, but such data does not work well with older ICU runtime without
-# fixing the issue. For now, we define our own Europe/Dubin in ICU, replacing
-# Europe/Dublin data from the tz database.
-#
-
-#
-# tzdata2018e suggests to use alternative zone definitions for use GB-Eire
-# and EU rule after Oct 27, 1968. (Yoshito 2018-05-04)
-#
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Dublin--ICU -0:25:00 - LMT 1880 Aug 2
- -0:25:21 - DMT 1916 May 21 2:00s
- -0:25:21 1:00 IST 1916 Oct 1 2:00s
- 0:00 GB-Eire %s 1921 Dec 6 # independence
- 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00s
- 0:00 1:00 IST 1946 Oct 6 2:00s
- 0:00 - GMT 1947 Mar 16 2:00s
- 0:00 1:00 IST 1947 Nov 2 2:00s
- 0:00 - GMT 1948 Apr 18 2:00s
- 0:00 GB-Eire GMT/IST 1968 Oct 27
-# The next line is for when negative SAVE values are used.
-# 1:00 Eire IST/GMT
-# These three lines are for when SAVE values are always nonnegative.
- 1:00 - IST 1971 Oct 31 2:00u
- 0:00 GB-Eire GMT/IST 1996
- 0:00 EU GMT/IST
-
-Link Europe/Dublin--ICU Eire--ICU
-
-
-#
-# tzdata2018e also added another instance of negative DST to
-# Europe/Prague and Africa/Windhoek
-#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Prague--ICU 0:57:44 - LMT 1850
- 0:57:44 - PMT 1891 Oct # Prague Mean Time
- 1:00 C-Eur CE%sT 1945 May 9
- 1:00 Czech CE%sT 1946 Dec 1 3:00
-# Vanguard section, for zic and other parsers that support negative DST.
-# 1:00 -1:00 GMT 1947 Feb 23 2:00
-# Rearguard section, for parsers that do not support negative DST.
- 0:00 - GMT 1947 Feb 23 2:00
-# End of rearguard section.
- 1:00 Czech CE%sT 1979
- 1:00 EU CE%sT
-
-# Slovakia
-Link Europe/Prague--ICU Europe/Bratislava--ICU
-
-# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# Vanguard section, for zic and other parsers that support negative DST.
-#Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
-#Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
-#Rule Namibia 1995 2017 - Apr Sun>=1 2:00 -1:00 WAT
-# Rearguard section, for parsers that do not support negative DST.
-Rule Namibia--ICU 1994 only - Mar 21 0:00 0 WAT
-Rule Namibia--ICU 1994 2017 - Sep Sun>=1 2:00 1:00 CAT
-Rule Namibia--ICU 1995 2017 - Apr Sun>=1 2:00 0 WAT
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Windhoek--ICU 1:08:24 - LMT 1892 Feb 8
- 1:30 - +0130 1903 Mar
- 2:00 - SAST 1942 Sep 20 2:00
- 2:00 1:00 SAST 1943 Mar 21 2:00
- 2:00 - SAST 1990 Mar 21 # independence
-# Vanguard section, for zic and other parsers that support negative DST.
-# 2:00 Namibia %s
-# Rearguard section, for parsers that do not support negative DST.
- 2:00 - CAT 1994 Mar 21 0:00
-# From Paul Eggert (2017-04-07):
-# The official date of the 2017 rule change was 2017-10-24. See:
-# http://www.lac.org.na/laws/annoSTAT/Namibian%20Time%20Act%209%20of%202017.pdf
- 1:00 Namibia--ICU %s 2017 Oct 24
- 2:00 - CAT
-# End of rearguard section.
-
-#
-# tzdata2018h added negative DST rules for Morocco without 'rearguard' section.
-# Morocco changes clock to UTC+0 during Ramadan and the TZ database uses
-# negative offset rules to handle it. Although, ICU 61+ releases support
-# negative offset rules, we use modified zones below (Morroco rules after 2018
-# including negative DST offsets are embedded to zone definition directly).
-#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Casablanca--ICU -0:30:20 - LMT 1913 Oct 26
- 0:00 Morocco +00/+01 1984 Mar 16
- 1:00 - +01 1986
- 0:00 Morocco +00/+01 2018 Oct 28 3:00
- 1:00 - +01 2019 May 5 3:00
- 0:00 - +00 2019 Jun 9 2:00
- 1:00 - +01 2020 Apr 19 3:00
- 0:00 - +00 2020 May 24 2:00
- 1:00 - +01 2021 Apr 11 3:00
- 0:00 - +00 2021 May 16 2:00
- 1:00 - +01 2022 Mar 27 3:00
- 0:00 - +00 2022 May 8 2:00
- 1:00 - +01 2023 Mar 19 3:00
- 0:00 - +00 2023 Apr 23 2:00
- 1:00 - +01 2024 Mar 10 3:00
- 0:00 - +00 2024 Apr 14 2:00
- 1:00 - +01 2025 Feb 23 3:00
- 0:00 - +00 2025 Apr 6 2:00
- 1:00 - +01 2026 Feb 15 3:00
- 0:00 - +00 2026 Mar 22 2:00
- 1:00 - +01 2027 Feb 7 3:00
- 0:00 - +00 2027 Mar 14 2:00
- 1:00 - +01 2028 Jan 23 3:00
- 0:00 - +00 2028 Feb 27 2:00
- 1:00 - +01 2029 Jan 14 3:00
- 0:00 - +00 2029 Feb 18 2:00
- 1:00 - +01 2029 Dec 30 3:00
- 0:00 - +00 2030 Feb 10 2:00
- 1:00 - +01 2030 Dec 22 3:00
- 0:00 - +00 2031 Jan 26 2:00
- 1:00 - +01 2031 Dec 14 3:00
- 0:00 - +00 2032 Jan 18 2:00
- 1:00 - +01 2032 Nov 28 3:00
- 0:00 - +00 2033 Jan 9 2:00
- 1:00 - +01 2033 Nov 20 3:00
- 0:00 - +00 2033 Dec 25 2:00
- 1:00 - +01 2034 Nov 5 3:00
- 0:00 - +00 2034 Dec 17 2:00
- 1:00 - +01 2035 Oct 28 3:00
- 0:00 - +00 2035 Dec 2 2:00
- 1:00 - +01 2036 Oct 19 3:00
- 0:00 - +00 2036 Nov 23 2:00
- 1:00 - +01 2037 Oct 4 3:00
- 0:00 - +00 2037 Nov 15 2:00
- 1:00 - +01
-
-Zone Africa/El_Aaiun--ICU -0:52:48 - LMT 1934 Jan # El Aaiún
- -1:00 - -01 1976 Apr 14
- 0:00 Morocco +00/+01 2018 Oct 28 3:00
- 1:00 - +01 2019 May 5 3:00
- 0:00 - +00 2019 Jun 9 2:00
- 1:00 - +01 2020 Apr 19 3:00
- 0:00 - +00 2020 May 24 2:00
- 1:00 - +01 2021 Apr 11 3:00
- 0:00 - +00 2021 May 16 2:00
- 1:00 - +01 2022 Mar 27 3:00
- 0:00 - +00 2022 May 8 2:00
- 1:00 - +01 2023 Mar 19 3:00
- 0:00 - +00 2023 Apr 23 2:00
- 1:00 - +01 2024 Mar 10 3:00
- 0:00 - +00 2024 Apr 14 2:00
- 1:00 - +01 2025 Feb 23 3:00
- 0:00 - +00 2025 Apr 6 2:00
- 1:00 - +01 2026 Feb 15 3:00
- 0:00 - +00 2026 Mar 22 2:00
- 1:00 - +01 2027 Feb 7 3:00
- 0:00 - +00 2027 Mar 14 2:00
- 1:00 - +01 2028 Jan 23 3:00
- 0:00 - +00 2028 Feb 27 2:00
- 1:00 - +01 2029 Jan 14 3:00
- 0:00 - +00 2029 Feb 18 2:00
- 1:00 - +01 2029 Dec 30 3:00
- 0:00 - +00 2030 Feb 10 2:00
- 1:00 - +01 2030 Dec 22 3:00
- 0:00 - +00 2031 Jan 26 2:00
- 1:00 - +01 2031 Dec 14 3:00
- 0:00 - +00 2032 Jan 18 2:00
- 1:00 - +01 2032 Nov 28 3:00
- 0:00 - +00 2033 Jan 9 2:00
- 1:00 - +01 2033 Nov 20 3:00
- 0:00 - +00 2033 Dec 25 2:00
- 1:00 - +01 2034 Nov 5 3:00
- 0:00 - +00 2034 Dec 17 2:00
- 1:00 - +01 2035 Oct 28 3:00
- 0:00 - +00 2035 Dec 2 2:00
- 1:00 - +01 2036 Oct 19 3:00
- 0:00 - +00 2036 Nov 23 2:00
- 1:00 - +01 2037 Oct 4 3:00
- 0:00 - +00 2037 Nov 15 2:00
- 1:00 - +01
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index a91910f..5dc6ffb 100644
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fa392798700da05ef99e1f222f4b5854d135a89fdf63fe4ce59c9eecd05b3754
-size 12698096
+oid sha256:0d98156c68867e10e71d59549cb054852ed6a935bf1e2db86b09febc491fdbd6
+size 12698093
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 421dc71..b58eed4 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:5ac6d5dcf27192d2c1446cda747ec795a526c2603aad41b03130ffb9650e6ec1
-size 94059
+oid sha256:b31a226a3757af364f56ed24af75f3a5194fd8a641b4bd9f6104451394e23f10
+size 94046
