Skip to content

Commit ebc17c7

Browse files
committed
8339637: (tz) Update Timezone Data to 2024b
Reviewed-by: naoto, coffeys, jlu
1 parent e7cf25c commit ebc17c7

File tree

23 files changed

+1258
-963
lines changed

23 files changed

+1258
-963
lines changed

src/java.base/share/classes/java/time/ZoneId.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -186,15 +186,12 @@ public abstract sealed class ZoneId implements Serializable permits ZoneOffset,
186186
* This map allows the IDs to continue to be used via the
187187
* {@link #of(String, Map)} factory method.
188188
* <p>
189-
* This map contains a mapping of the IDs that is in line with TZDB 2005r and
189+
* This map contains a mapping of the IDs that is in line with TZDB 2024b and
190190
* later, where 'EST', 'MST' and 'HST' map to IDs which do not include daylight
191-
* savings.
191+
* savings since 1970. This mapping may change in update releases in support of new versions of TZDB.
192192
* <p>
193193
* This maps as follows:
194194
* <ul>
195-
* <li>EST - -05:00</li>
196-
* <li>HST - -10:00</li>
197-
* <li>MST - -07:00</li>
198195
* <li>ACT - Australia/Darwin</li>
199196
* <li>AET - Australia/Sydney</li>
200197
* <li>AGT - America/Argentina/Buenos_Aires</li>
@@ -208,10 +205,13 @@ public abstract sealed class ZoneId implements Serializable permits ZoneOffset,
208205
* <li>CTT - Asia/Shanghai</li>
209206
* <li>EAT - Africa/Addis_Ababa</li>
210207
* <li>ECT - Europe/Paris</li>
208+
* <li>EST - America/Panama</li>
209+
* <li>HST - Pacific/Honolulu</li>
211210
* <li>IET - America/Indiana/Indianapolis</li>
212211
* <li>IST - Asia/Kolkata</li>
213212
* <li>JST - Asia/Tokyo</li>
214213
* <li>MIT - Pacific/Apia</li>
214+
* <li>MST - America/Phoenix</li>
215215
* <li>NET - Asia/Yerevan</li>
216216
* <li>NST - Pacific/Auckland</li>
217217
* <li>PLT - Asia/Karachi</li>
@@ -249,9 +249,9 @@ public abstract sealed class ZoneId implements Serializable permits ZoneOffset,
249249
entry("PST", "America/Los_Angeles"),
250250
entry("SST", "Pacific/Guadalcanal"),
251251
entry("VST", "Asia/Ho_Chi_Minh"),
252-
entry("EST", "-05:00"),
253-
entry("MST", "-07:00"),
254-
entry("HST", "-10:00")
252+
entry("EST", "America/Panama"),
253+
entry("MST", "America/Phoenix"),
254+
entry("HST", "Pacific/Honolulu")
255255
);
256256
/**
257257
* Serialization version.

src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,11 @@ private static void addOldMapping() {
281281
if (USE_OLDMAPPING) {
282282
aliases.put("EST", "America/New_York");
283283
aliases.put("MST", "America/Denver");
284-
aliases.put("HST", "Pacific/Honolulu");
285284
} else {
286-
zones.put("EST", new ZoneInfo("EST", -18000000));
287-
zones.put("MST", new ZoneInfo("MST", -25200000));
288-
zones.put("HST", new ZoneInfo("HST", -36000000));
285+
aliases.put("EST", "America/Panama");
286+
aliases.put("MST", "America/Phoenix");
289287
}
288+
aliases.put("HST", "Pacific/Honolulu");
290289
}
291290

292291
public static boolean useOldMapping() {

src/java.base/share/data/tzdata/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# or visit www.oracle.com if you need additional information or have any
2222
# questions.
2323
#
24-
tzdata2024a
24+
tzdata2024b

src/java.base/share/data/tzdata/africa

+42-31
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,16 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
126126

127127
# Cape Verde / Cabo Verde
128128
#
129-
# From Paul Eggert (2018-02-16):
130-
# Shanks gives 1907 for the transition to +02.
131-
# For now, ignore that and follow the 1911-05-26 Portuguese decree
132-
# (see Europe/Lisbon).
129+
# From Tim Parenti (2024-07-01), per Paul Eggert (2018-02-16):
130+
# For timestamps before independence, see commentary for Europe/Lisbon.
131+
# Shanks gives 1907 instead for the transition to -02.
133132
#
134133
# Zone NAME STDOFF RULES FORMAT [UNTIL]
135134
Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia
136-
-2:00 - -02 1942 Sep
137-
-2:00 1:00 -01 1945 Oct 15
138-
-2:00 - -02 1975 Nov 25 2:00
139-
-1:00 - -01
135+
-2:00 - %z 1942 Sep
136+
-2:00 1:00 %z 1945 Oct 15
137+
-2:00 - %z 1975 Nov 25 2:00
138+
-1:00 - %z
140139

141140
# Chad
142141
# Zone NAME STDOFF RULES FORMAT [UNTIL]
@@ -368,14 +367,12 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
368367

369368
# Guinea-Bissau
370369
#
371-
# From Paul Eggert (2018-02-16):
372-
# Shanks gives 1911-05-26 for the transition to WAT,
373-
# evidently confusing the date of the Portuguese decree
374-
# (see Europe/Lisbon) with the date that it took effect.
370+
# From Tim Parenti (2024-07-01), per Paul Eggert (2018-02-16):
371+
# For timestamps before independence, see commentary for Europe/Lisbon.
375372
#
376373
# Zone NAME STDOFF RULES FORMAT [UNTIL]
377374
Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
378-
-1:00 - -01 1975
375+
-1:00 - %z 1975
379376
0:00 - GMT
380377

381378
# Comoros
@@ -440,10 +437,10 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
440437

441438
# Zone NAME STDOFF RULES FORMAT [UNTIL]
442439
Zone Africa/Nairobi 2:27:16 - LMT 1908 May
443-
2:30 - +0230 1928 Jun 30 24:00
440+
2:30 - %z 1928 Jun 30 24:00
444441
3:00 - EAT 1930 Jan 4 24:00
445-
2:30 - +0230 1936 Dec 31 24:00
446-
2:45 - +0245 1942 Jul 31 24:00
442+
2:30 - %z 1936 Dec 31 24:00
443+
2:45 - %z 1942 Jul 31 24:00
447444
3:00 - EAT
448445

449446
# Liberia
@@ -614,7 +611,7 @@ Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
614611
Rule Mauritius 2009 only - Mar lastSun 2:00 0 -
615612
# Zone NAME STDOFF RULES FORMAT [UNTIL]
616613
Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
617-
4:00 Mauritius +04/+05
614+
4:00 Mauritius %z
618615
# Agalega Is, Rodriguez
619616
# no information; probably like Indian/Mauritius
620617

@@ -1094,10 +1091,10 @@ Rule Morocco 2087 only - May 11 2:00 0 -
10941091

10951092
# Zone NAME STDOFF RULES FORMAT [UNTIL]
10961093
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
1097-
0:00 Morocco +00/+01 1984 Mar 16
1098-
1:00 - +01 1986
1099-
0:00 Morocco +00/+01 2018 Oct 28 3:00
1100-
1:00 Morocco +01/+00
1094+
0:00 Morocco %z 1984 Mar 16
1095+
1:00 - %z 1986
1096+
0:00 Morocco %z 2018 Oct 28 3:00
1097+
1:00 Morocco %z
11011098

11021099
# Western Sahara
11031100
#
@@ -1111,9 +1108,9 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
11111108
# since most of it was then controlled by Morocco.
11121109

11131110
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
1114-
-1:00 - -01 1976 Apr 14
1115-
0:00 Morocco +00/+01 2018 Oct 28 3:00
1116-
1:00 Morocco +01/+00
1111+
-1:00 - %z 1976 Apr 14
1112+
0:00 Morocco %z 2018 Oct 28 3:00
1113+
1:00 Morocco %z
11171114

11181115
# Botswana
11191116
# Burundi
@@ -1124,13 +1121,27 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
11241121
# Zambia
11251122
# Zimbabwe
11261123
#
1127-
# Shanks gives 1903-03-01 for the transition to CAT.
1128-
# Perhaps the 1911-05-26 Portuguese decree
1129-
# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
1130-
# merely made it official?
1124+
# From Tim Parenti (2024-07-01):
1125+
# For timestamps before Mozambique's independence, see commentary for
1126+
# Europe/Lisbon.
1127+
#
1128+
# From Paul Eggert (2024-05-24):
1129+
# The London Gazette, 1903-04-03, page 2245, says that
1130+
# as of 1903-03-03 a time ball at the port of Lourenço Marques
1131+
# (as Maputo was then called) was dropped daily at 13:00:00 LMT,
1132+
# corresponding to 22:49:41.7 GMT, so local time was +02:10:18.3.
1133+
# Conversely, the newspaper South Africa, 1909-02-09, page 321,
1134+
# says the port had just installed an apparatus that communicated
1135+
# "from the controlling clock in the new Observatory at Reuben Point ...
1136+
# exact mean South African time, i.e., 30 deg., or 2 hours East of Greenwich".
1137+
# Although Shanks gives 1903-03-01 for the transition to CAT,
1138+
# evidently the port transitioned to CAT after 1903-03-03 but before
1139+
# the Portuguese legal transition of 1912-01-01 (see Europe/Lisbon commentary).
1140+
# For lack of better info, list 1909 as the transition date.
11311141
#
11321142
# Zone NAME STDOFF RULES FORMAT [UNTIL]
1133-
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
1143+
#STDOFF 2:10:18.3
1144+
Zone Africa/Maputo 2:10:18 - LMT 1909
11341145
2:00 - CAT
11351146

11361147
# Namibia
@@ -1195,7 +1206,7 @@ Rule Namibia 1995 2017 - Apr Sun>=1 2:00 -1:00 WAT
11951206

11961207
# Zone NAME STDOFF RULES FORMAT [UNTIL]
11971208
Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
1198-
1:30 - +0130 1903 Mar
1209+
1:30 - %z 1903 Mar
11991210
2:00 - SAST 1942 Sep 20 2:00
12001211
2:00 1:00 SAST 1943 Mar 21 2:00
12011212
2:00 - SAST 1990 Mar 21 # independence
@@ -1283,7 +1294,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
12831294
Zone Africa/Lagos 0:13:35 - LMT 1905 Jul 1
12841295
0:00 - GMT 1908 Jul 1
12851296
0:13:35 - LMT 1914 Jan 1
1286-
0:30 - +0030 1919 Sep 1
1297+
0:30 - %z 1919 Sep 1
12871298
1:00 - WAT
12881299

12891300
# São Tomé and Príncipe

src/java.base/share/data/tzdata/antarctica

+29-29
Original file line numberDiff line numberDiff line change
@@ -110,34 +110,34 @@
110110

111111
# Zone NAME STDOFF RULES FORMAT [UNTIL]
112112
Zone Antarctica/Casey 0 - -00 1969
113-
8:00 - +08 2009 Oct 18 2:00
114-
11:00 - +11 2010 Mar 5 2:00
115-
8:00 - +08 2011 Oct 28 2:00
116-
11:00 - +11 2012 Feb 21 17:00u
117-
8:00 - +08 2016 Oct 22
118-
11:00 - +11 2018 Mar 11 4:00
119-
8:00 - +08 2018 Oct 7 4:00
120-
11:00 - +11 2019 Mar 17 3:00
121-
8:00 - +08 2019 Oct 4 3:00
122-
11:00 - +11 2020 Mar 8 3:00
123-
8:00 - +08 2020 Oct 4 0:01
124-
11:00 - +11 2021 Mar 14 0:00
125-
8:00 - +08 2021 Oct 3 0:01
126-
11:00 - +11 2022 Mar 13 0:00
127-
8:00 - +08 2022 Oct 2 0:01
128-
11:00 - +11 2023 Mar 9 3:00
129-
8:00 - +08
113+
8:00 - %z 2009 Oct 18 2:00
114+
11:00 - %z 2010 Mar 5 2:00
115+
8:00 - %z 2011 Oct 28 2:00
116+
11:00 - %z 2012 Feb 21 17:00u
117+
8:00 - %z 2016 Oct 22
118+
11:00 - %z 2018 Mar 11 4:00
119+
8:00 - %z 2018 Oct 7 4:00
120+
11:00 - %z 2019 Mar 17 3:00
121+
8:00 - %z 2019 Oct 4 3:00
122+
11:00 - %z 2020 Mar 8 3:00
123+
8:00 - %z 2020 Oct 4 0:01
124+
11:00 - %z 2021 Mar 14 0:00
125+
8:00 - %z 2021 Oct 3 0:01
126+
11:00 - %z 2022 Mar 13 0:00
127+
8:00 - %z 2022 Oct 2 0:01
128+
11:00 - %z 2023 Mar 9 3:00
129+
8:00 - %z
130130
Zone Antarctica/Davis 0 - -00 1957 Jan 13
131-
7:00 - +07 1964 Nov
131+
7:00 - %z 1964 Nov
132132
0 - -00 1969 Feb
133-
7:00 - +07 2009 Oct 18 2:00
134-
5:00 - +05 2010 Mar 10 20:00u
135-
7:00 - +07 2011 Oct 28 2:00
136-
5:00 - +05 2012 Feb 21 20:00u
137-
7:00 - +07
133+
7:00 - %z 2009 Oct 18 2:00
134+
5:00 - %z 2010 Mar 10 20:00u
135+
7:00 - %z 2011 Oct 28 2:00
136+
5:00 - %z 2012 Feb 21 20:00u
137+
7:00 - %z
138138
Zone Antarctica/Mawson 0 - -00 1954 Feb 13
139-
6:00 - +06 2009 Oct 18 2:00
140-
5:00 - +05
139+
6:00 - %z 2009 Oct 18 2:00
140+
5:00 - %z
141141
# References:
142142
# Casey Weather (1998-02-26)
143143
# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
@@ -313,10 +313,10 @@ Zone Antarctica/Troll 0 - -00 2005 Feb 12
313313

314314
# Zone NAME STDOFF RULES FORMAT [UNTIL]
315315
Zone Antarctica/Vostok 0 - -00 1957 Dec 16
316-
7:00 - +07 1994 Feb
316+
7:00 - %z 1994 Feb
317317
0 - -00 1994 Nov
318-
7:00 - +07 2023 Dec 18 2:00
319-
5:00 - +05
318+
7:00 - %z 2023 Dec 18 2:00
319+
5:00 - %z
320320

321321
# S Africa - year-round bases
322322
# Marion Island, -4653+03752
@@ -349,7 +349,7 @@ Zone Antarctica/Vostok 0 - -00 1957 Dec 16
349349
#
350350
# Zone NAME STDOFF RULES FORMAT [UNTIL]
351351
Zone Antarctica/Rothera 0 - -00 1976 Dec 1
352-
-3:00 - -03
352+
-3:00 - %z
353353

354354
# Uruguay - year round base
355355
# Artigas, King George Island, -621104-0585107

0 commit comments

Comments
 (0)