1 |
commit 8589b1229cffb9a0ab00baf62ce2d4376d31b055 |
2 |
Author: Andrew John Hughes <andrew@openjdk.org> |
3 |
Date: Fri Oct 14 22:55:39 2022 +0100 |
4 |
|
5 |
Backport f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b |
6 |
|
7 |
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION |
8 |
index decb8716b22..889d0e6dad7 100644 |
9 |
--- a/jdk/make/data/tzdata/VERSION |
10 |
+++ b/jdk/make/data/tzdata/VERSION |
11 |
@@ -21,4 +21,4 @@ |
12 |
# or visit www.oracle.com if you need additional information or have any |
13 |
# questions. |
14 |
# |
15 |
-tzdata2022c |
16 |
+tzdata2022d |
17 |
diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia |
18 |
index 6cb6d2c57cf..1dc7d34f88e 100644 |
19 |
--- a/jdk/make/data/tzdata/asia |
20 |
+++ b/jdk/make/data/tzdata/asia |
21 |
@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 |
22 |
# The winter time in 2015 started on October 23 at 01:00. |
23 |
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY |
24 |
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583 |
25 |
-# |
26 |
-# From Paul Eggert (2019-04-10): |
27 |
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday |
28 |
-# preceding March's last Sunday (i.e., Sat>=24). |
29 |
|
30 |
# From P Chan (2021-10-18): |
31 |
# http://wafa.ps/Pages/Details/34701 |
32 |
@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 |
33 |
# From Heba Hamad (2022-03-10): |
34 |
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM. |
35 |
|
36 |
+# From Heba Hamad (2022-08-30): |
37 |
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by |
38 |
+# 60 minutes backwards. Also the state of Palestine adopted the summer |
39 |
+# and winter time for the years: 2023,2024,2025,2026 ... |
40 |
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf |
41 |
+# (2022-08-31): ... the Saturday before the last Sunday in March and October |
42 |
+# at 2:00 AM ,for the years from 2023 to 2026. |
43 |
+# (2022-09-05): https://mtit.pna.ps/Site/New/1453 |
44 |
+# |
45 |
+# From Paul Eggert (2022-08-31): |
46 |
+# For now, assume that this rule will also be used after 2026. |
47 |
+ |
48 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S |
49 |
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S |
50 |
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - |
51 |
@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 - |
52 |
Rule Palestine 2014 only - Oct 24 0:00 0 - |
53 |
Rule Palestine 2015 only - Mar 28 0:00 1:00 S |
54 |
Rule Palestine 2015 only - Oct 23 1:00 0 - |
55 |
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S |
56 |
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 - |
57 |
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S |
58 |
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 - |
59 |
Rule Palestine 2019 only - Mar 29 0:00 1:00 S |
60 |
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - |
61 |
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S |
62 |
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 - |
63 |
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S |
64 |
Rule Palestine 2020 only - Oct 24 1:00 0 - |
65 |
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 - |
66 |
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S |
67 |
+Rule Palestine 2021 only - Oct 29 1:00 0 - |
68 |
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S |
69 |
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - |
70 |
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S |
71 |
|
72 |
# Zone NAME STDOFF RULES FORMAT [UNTIL] |
73 |
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct |
74 |
diff --git a/jdk/make/data/tzdata/backward b/jdk/make/data/tzdata/backward |
75 |
index d4a29e8cf29..7765d99aedf 100644 |
76 |
--- a/jdk/make/data/tzdata/backward |
77 |
+++ b/jdk/make/data/tzdata/backward |
78 |
@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT |
79 |
Link Europe/London Europe/Belfast |
80 |
Link Europe/Kyiv Europe/Kiev |
81 |
Link Europe/Chisinau Europe/Tiraspol |
82 |
+Link Europe/Kyiv Europe/Uzhgorod |
83 |
+Link Europe/Kyiv Europe/Zaporozhye |
84 |
Link Europe/London GB |
85 |
Link Europe/London GB-Eire |
86 |
Link Etc/GMT GMT+0 |
87 |
diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe |
88 |
index f7eb7a387aa..9e0a538f86d 100644 |
89 |
--- a/jdk/make/data/tzdata/europe |
90 |
+++ b/jdk/make/data/tzdata/europe |
91 |
@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880 |
92 |
# From Alexander Krivenyshev (2014-03-17): |
93 |
# time change at 2:00 (2am) on March 30, 2014 |
94 |
# https://vz.ru/news/2014/3/17/677464.html |
95 |
-# From Paul Eggert (2014-03-30): |
96 |
-# Simferopol and Sevastopol reportedly changed their central town clocks |
97 |
-# late the previous day, but this appears to have been ceremonial |
98 |
-# and the discrepancies are small enough to not worry about. |
99 |
+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30): |
100 |
+# The clocks at the railway station in Simferopol were put forward from 22:00 |
101 |
+# to 24:00 the previous day in a "symbolic ceremony"; however, per |
102 |
+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings |
103 |
+# time switch at 2am" on Sunday. |
104 |
+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html |
105 |
+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329 |
106 |
+# https://www.bbc.com/news/av/world-europe-26806583 |
107 |
2:00 EU EE%sT 2014 Mar 30 2:00 |
108 |
4:00 - MSK 2014 Oct 26 2:00s |
109 |
3:00 - MSK |
110 |
@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. |
111 |
# US colleague David Cochrane) are still trying to get more |
112 |
# information upon these local deviations from Kiev rules. |
113 |
# |
114 |
-# From Paul Eggert (2022-02-08): |
115 |
-# For now, assume that Ukraine's other three zones followed the same rules, |
116 |
+# From Paul Eggert (2022-08-27): |
117 |
+# For now, assume that Ukraine's zones all followed the same rules, |
118 |
# except that Crimea switched to Moscow time in 1994 as described elsewhere. |
119 |
|
120 |
# From Igor Karpov, who works for the Ukrainian Ministry of Justice, |
121 |
@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. |
122 |
# * Ukrainian Government's Resolution of 20.03.1992, No. 139. |
123 |
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm |
124 |
|
125 |
-# From Paul Eggert (2022-04-12): |
126 |
-# As is usual in tzdb, Ukrainian zones use the most common English spellings. |
127 |
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in |
128 |
-# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev, |
129 |
-# "Kyiv" is now more common due to widespread reporting of the current conflict. |
130 |
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and |
131 |
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is |
132 |
-# certainly wrong as a transliteration of the Czech "Praha". |
133 |
-# English-language spelling of Ukrainian names is in flux, and |
134 |
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more |
135 |
-# common in English; in the meantime, do not change these |
136 |
-# English spellings as that means less disruption for our users. |
137 |
- |
138 |
# Zone NAME STDOFF RULES FORMAT [UNTIL] |
139 |
-# This represents most of Ukraine. See above for the spelling of "Kyiv". |
140 |
Zone Europe/Kyiv 2:02:04 - LMT 1880 |
141 |
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time |
142 |
2:00 - EET 1930 Jun 21 |
143 |
@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880 |
144 |
2:00 1:00 EEST 1991 Sep 29 3:00 |
145 |
2:00 C-Eur EE%sT 1996 May 13 |
146 |
2:00 EU EE%sT |
147 |
-# Transcarpathia used CET 1990/1991. |
148 |
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but |
149 |
-# "Uzhgorod" is more common in English. |
150 |
-Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct |
151 |
- 1:00 - CET 1940 |
152 |
- 1:00 C-Eur CE%sT 1944 Oct |
153 |
- 1:00 1:00 CEST 1944 Oct 26 |
154 |
- 1:00 - CET 1945 Jun 29 |
155 |
- 3:00 Russia MSK/MSD 1990 |
156 |
- 3:00 - MSK 1990 Jul 1 2:00 |
157 |
- 1:00 - CET 1991 Mar 31 3:00 |
158 |
- 2:00 - EET 1992 Mar 20 |
159 |
- 2:00 C-Eur EE%sT 1996 May 13 |
160 |
- 2:00 EU EE%sT |
161 |
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. |
162 |
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but |
163 |
-# "Zaporozh'ye" is more common in English. Use the common English |
164 |
-# spelling, except omit the apostrophe as it is not allowed in |
165 |
-# portable Posix file names. |
166 |
-Zone Europe/Zaporozhye 2:20:40 - LMT 1880 |
167 |
- 2:20 - +0220 1924 May 2 |
168 |
- 2:00 - EET 1930 Jun 21 |
169 |
- 3:00 - MSK 1941 Aug 25 |
170 |
- 1:00 C-Eur CE%sT 1943 Oct 25 |
171 |
- 3:00 Russia MSK/MSD 1991 Mar 31 2:00 |
172 |
- 2:00 E-Eur EE%sT 1992 Mar 20 |
173 |
- 2:00 C-Eur EE%sT 1996 May 13 |
174 |
- 2:00 EU EE%sT |
175 |
|
176 |
# Vatican City |
177 |
# See Europe/Rome. |
178 |
diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica |
179 |
index 13ec081c7e0..3c0e0e2061c 100644 |
180 |
--- a/jdk/make/data/tzdata/southamerica |
181 |
+++ b/jdk/make/data/tzdata/southamerica |
182 |
@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 |
183 |
# for America/Santiago will start on midnight of September 11th; |
184 |
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas) |
185 |
# will keep UTC -3 "indefinitely"... This is because on September 4th |
186 |
-# we will have a voting whether to approve a new Constitution.... |
187 |
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/ |
188 |
+# we will have a voting whether to approve a new Constitution. |
189 |
+# |
190 |
+# From Eduardo Romero Urra (2022-08-17): |
191 |
+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf |
192 |
+# |
193 |
+# From Paul Eggert (2022-08-17): |
194 |
+# Although the presidential decree stops at fall 2026, assume that |
195 |
+# similar DST rules will continue thereafter. |
196 |
|
197 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S |
198 |
Rule Chile 1927 1931 - Sep 1 0:00 1:00 - |
199 |
diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab |
200 |
index 51b65fa273c..ee025196e50 100644 |
201 |
--- a/jdk/make/data/tzdata/zone.tab |
202 |
+++ b/jdk/make/data/tzdata/zone.tab |
203 |
@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti |
204 |
TW +2503+12130 Asia/Taipei |
205 |
TZ -0648+03917 Africa/Dar_es_Salaam |
206 |
UA +5026+03031 Europe/Kyiv Ukraine (most areas) |
207 |
-UA +4837+02218 Europe/Uzhgorod Transcarpathia |
208 |
-UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk |
209 |
UG +0019+03225 Africa/Kampala |
210 |
UM +2813-17722 Pacific/Midway Midway Islands |
211 |
UM +1917+16637 Pacific/Wake Wake Island |
212 |
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java |
213 |
index 43bddd5859a..4b84cda3067 100644 |
214 |
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java |
215 |
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java |
216 |
@@ -573,12 +573,8 @@ public final class ZoneInfoFile { |
217 |
// we can then pass in the dom = -1, dow > 0 into ZoneInfo |
218 |
// |
219 |
// hacking, assume the >=24 is the result of ZRB optimization for |
220 |
- // "last", it works for now. From tzdata2020d this hacking |
221 |
- // will not work for Asia/Gaza and Asia/Hebron which follow |
222 |
- // Palestine DST rules. |
223 |
- if (dom < 0 || dom >= 24 && |
224 |
- !(zoneId.equals("Asia/Gaza") || |
225 |
- zoneId.equals("Asia/Hebron"))) { |
226 |
+ // "last", it works for now. |
227 |
+ if (dom < 0 || dom >= 24) { |
228 |
params[1] = -1; |
229 |
params[2] = toCalendarDOW[dow]; |
230 |
} else { |
231 |
@@ -600,7 +596,6 @@ public final class ZoneInfoFile { |
232 |
params[7] = 0; |
233 |
} else { |
234 |
// hacking: see comment above |
235 |
- // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e |
236 |
if (dom < 0 || dom >= 24) { |
237 |
params[6] = -1; |
238 |
params[7] = toCalendarDOW[dow]; |
239 |
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION |
240 |
index c32bee39fba..71470168456 100644 |
241 |
--- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION |
242 |
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION |
243 |
@@ -1 +1 @@ |
244 |
-tzdata2022c |
245 |
+tzdata2022d |
246 |
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt |
247 |
index a5e6428a3f5..e3ce742f887 100644 |
248 |
--- a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt |
249 |
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt |
250 |
@@ -183,6 +183,8 @@ Link Etc/UTC Etc/UCT |
251 |
Link Europe/London Europe/Belfast |
252 |
Link Europe/Kyiv Europe/Kiev |
253 |
Link Europe/Chisinau Europe/Tiraspol |
254 |
+Link Europe/Kyiv Europe/Uzhgorod |
255 |
+Link Europe/Kyiv Europe/Zaporozhye |
256 |
Link Europe/London GB |
257 |
Link Europe/London GB-Eire |
258 |
Link Etc/GMT GMT+0 |
259 |
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt |
260 |
index fc148537f1f..b3823958ae4 100644 |
261 |
--- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt |
262 |
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt |
263 |
@@ -163,11 +163,9 @@ Europe/Simferopol MSK |
264 |
Europe/Sofia EET EEST |
265 |
Europe/Tallinn EET EEST |
266 |
Europe/Tirane CET CEST |
267 |
-Europe/Uzhgorod EET EEST |
268 |
Europe/Vienna CET CEST |
269 |
Europe/Vilnius EET EEST |
270 |
Europe/Warsaw CET CEST |
271 |
-Europe/Zaporozhye EET EEST |
272 |
Europe/Zurich CET CEST |
273 |
HST HST |
274 |
MET MET MEST |
275 |
diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java |
276 |
index 3aad69f8118..c682531d4bd 100644 |
277 |
--- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java |
278 |
+++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java |
279 |
@@ -173,10 +173,19 @@ public class TestZoneInfo310 { |
280 |
* Temporary ignoring the failing TimeZones which are having zone |
281 |
* rules defined till year 2037 and/or above and have negative DST |
282 |
* save time in IANA tzdata. This bug is tracked via JDK-8223388. |
283 |
+ * |
284 |
+ * Tehran/Iran rule has rules beyond 2037, in which javazic assumes |
285 |
+ * to be the last year. Thus javazic's rule is based on year 2037 |
286 |
+ * (Mar 20th/Sep 20th are the cutover dates), while the real rule |
287 |
+ * has year 2087 where Mar 21st/Sep 21st are the cutover dates. |
288 |
*/ |
289 |
- if (zid.equals("Africa/Casablanca") || zid.equals("Africa/El_Aaiun") |
290 |
- || zid.equals("Asia/Tehran") || zid.equals("Iran")) { |
291 |
- continue; |
292 |
+ if (zid.equals("Africa/Casablanca") || // uses "Morocco" rule |
293 |
+ zid.equals("Africa/El_Aaiun") || // uses "Morocco" rule |
294 |
+ zid.equals("Asia/Tehran") || // last rule mismatch |
295 |
+ zid.equals("Asia/Gaza") || // uses "Palestine" rule |
296 |
+ zid.equals("Asia/Hebron") || // uses "Palestine" rule |
297 |
+ zid.equals("Iran")) { // last rule mismatch |
298 |
+ continue; |
299 |
} |
300 |
if (! zi.equalsTo(ziOLD)) { |
301 |
System.out.println(zi.diffsTo(ziOLD)); |
302 |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION |
303 |
index decb8716b22..889d0e6dad7 100644 |
304 |
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION |
305 |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION |
306 |
@@ -21,4 +21,4 @@ |
307 |
# or visit www.oracle.com if you need additional information or have any |
308 |
# questions. |
309 |
# |
310 |
-tzdata2022c |
311 |
+tzdata2022d |
312 |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia |
313 |
index 6cb6d2c57cf..1dc7d34f88e 100644 |
314 |
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia |
315 |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia |
316 |
@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 |
317 |
# The winter time in 2015 started on October 23 at 01:00. |
318 |
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY |
319 |
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583 |
320 |
-# |
321 |
-# From Paul Eggert (2019-04-10): |
322 |
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday |
323 |
-# preceding March's last Sunday (i.e., Sat>=24). |
324 |
|
325 |
# From P Chan (2021-10-18): |
326 |
# http://wafa.ps/Pages/Details/34701 |
327 |
@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 |
328 |
# From Heba Hamad (2022-03-10): |
329 |
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM. |
330 |
|
331 |
+# From Heba Hamad (2022-08-30): |
332 |
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by |
333 |
+# 60 minutes backwards. Also the state of Palestine adopted the summer |
334 |
+# and winter time for the years: 2023,2024,2025,2026 ... |
335 |
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf |
336 |
+# (2022-08-31): ... the Saturday before the last Sunday in March and October |
337 |
+# at 2:00 AM ,for the years from 2023 to 2026. |
338 |
+# (2022-09-05): https://mtit.pna.ps/Site/New/1453 |
339 |
+# |
340 |
+# From Paul Eggert (2022-08-31): |
341 |
+# For now, assume that this rule will also be used after 2026. |
342 |
+ |
343 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S |
344 |
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S |
345 |
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - |
346 |
@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 - |
347 |
Rule Palestine 2014 only - Oct 24 0:00 0 - |
348 |
Rule Palestine 2015 only - Mar 28 0:00 1:00 S |
349 |
Rule Palestine 2015 only - Oct 23 1:00 0 - |
350 |
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S |
351 |
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 - |
352 |
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S |
353 |
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 - |
354 |
Rule Palestine 2019 only - Mar 29 0:00 1:00 S |
355 |
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - |
356 |
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S |
357 |
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 - |
358 |
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S |
359 |
Rule Palestine 2020 only - Oct 24 1:00 0 - |
360 |
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 - |
361 |
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S |
362 |
+Rule Palestine 2021 only - Oct 29 1:00 0 - |
363 |
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S |
364 |
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - |
365 |
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S |
366 |
|
367 |
# Zone NAME STDOFF RULES FORMAT [UNTIL] |
368 |
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct |
369 |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward |
370 |
index d4a29e8cf29..7765d99aedf 100644 |
371 |
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward |
372 |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward |
373 |
@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT |
374 |
Link Europe/London Europe/Belfast |
375 |
Link Europe/Kyiv Europe/Kiev |
376 |
Link Europe/Chisinau Europe/Tiraspol |
377 |
+Link Europe/Kyiv Europe/Uzhgorod |
378 |
+Link Europe/Kyiv Europe/Zaporozhye |
379 |
Link Europe/London GB |
380 |
Link Europe/London GB-Eire |
381 |
Link Etc/GMT GMT+0 |
382 |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe |
383 |
index f7eb7a387aa..9e0a538f86d 100644 |
384 |
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe |
385 |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe |
386 |
@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880 |
387 |
# From Alexander Krivenyshev (2014-03-17): |
388 |
# time change at 2:00 (2am) on March 30, 2014 |
389 |
# https://vz.ru/news/2014/3/17/677464.html |
390 |
-# From Paul Eggert (2014-03-30): |
391 |
-# Simferopol and Sevastopol reportedly changed their central town clocks |
392 |
-# late the previous day, but this appears to have been ceremonial |
393 |
-# and the discrepancies are small enough to not worry about. |
394 |
+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30): |
395 |
+# The clocks at the railway station in Simferopol were put forward from 22:00 |
396 |
+# to 24:00 the previous day in a "symbolic ceremony"; however, per |
397 |
+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings |
398 |
+# time switch at 2am" on Sunday. |
399 |
+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html |
400 |
+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329 |
401 |
+# https://www.bbc.com/news/av/world-europe-26806583 |
402 |
2:00 EU EE%sT 2014 Mar 30 2:00 |
403 |
4:00 - MSK 2014 Oct 26 2:00s |
404 |
3:00 - MSK |
405 |
@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. |
406 |
# US colleague David Cochrane) are still trying to get more |
407 |
# information upon these local deviations from Kiev rules. |
408 |
# |
409 |
-# From Paul Eggert (2022-02-08): |
410 |
-# For now, assume that Ukraine's other three zones followed the same rules, |
411 |
+# From Paul Eggert (2022-08-27): |
412 |
+# For now, assume that Ukraine's zones all followed the same rules, |
413 |
# except that Crimea switched to Moscow time in 1994 as described elsewhere. |
414 |
|
415 |
# From Igor Karpov, who works for the Ukrainian Ministry of Justice, |
416 |
@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. |
417 |
# * Ukrainian Government's Resolution of 20.03.1992, No. 139. |
418 |
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm |
419 |
|
420 |
-# From Paul Eggert (2022-04-12): |
421 |
-# As is usual in tzdb, Ukrainian zones use the most common English spellings. |
422 |
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in |
423 |
-# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev, |
424 |
-# "Kyiv" is now more common due to widespread reporting of the current conflict. |
425 |
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and |
426 |
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is |
427 |
-# certainly wrong as a transliteration of the Czech "Praha". |
428 |
-# English-language spelling of Ukrainian names is in flux, and |
429 |
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more |
430 |
-# common in English; in the meantime, do not change these |
431 |
-# English spellings as that means less disruption for our users. |
432 |
- |
433 |
# Zone NAME STDOFF RULES FORMAT [UNTIL] |
434 |
-# This represents most of Ukraine. See above for the spelling of "Kyiv". |
435 |
Zone Europe/Kyiv 2:02:04 - LMT 1880 |
436 |
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time |
437 |
2:00 - EET 1930 Jun 21 |
438 |
@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880 |
439 |
2:00 1:00 EEST 1991 Sep 29 3:00 |
440 |
2:00 C-Eur EE%sT 1996 May 13 |
441 |
2:00 EU EE%sT |
442 |
-# Transcarpathia used CET 1990/1991. |
443 |
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but |
444 |
-# "Uzhgorod" is more common in English. |
445 |
-Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct |
446 |
- 1:00 - CET 1940 |
447 |
- 1:00 C-Eur CE%sT 1944 Oct |
448 |
- 1:00 1:00 CEST 1944 Oct 26 |
449 |
- 1:00 - CET 1945 Jun 29 |
450 |
- 3:00 Russia MSK/MSD 1990 |
451 |
- 3:00 - MSK 1990 Jul 1 2:00 |
452 |
- 1:00 - CET 1991 Mar 31 3:00 |
453 |
- 2:00 - EET 1992 Mar 20 |
454 |
- 2:00 C-Eur EE%sT 1996 May 13 |
455 |
- 2:00 EU EE%sT |
456 |
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. |
457 |
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but |
458 |
-# "Zaporozh'ye" is more common in English. Use the common English |
459 |
-# spelling, except omit the apostrophe as it is not allowed in |
460 |
-# portable Posix file names. |
461 |
-Zone Europe/Zaporozhye 2:20:40 - LMT 1880 |
462 |
- 2:20 - +0220 1924 May 2 |
463 |
- 2:00 - EET 1930 Jun 21 |
464 |
- 3:00 - MSK 1941 Aug 25 |
465 |
- 1:00 C-Eur CE%sT 1943 Oct 25 |
466 |
- 3:00 Russia MSK/MSD 1991 Mar 31 2:00 |
467 |
- 2:00 E-Eur EE%sT 1992 Mar 20 |
468 |
- 2:00 C-Eur EE%sT 1996 May 13 |
469 |
- 2:00 EU EE%sT |
470 |
|
471 |
# Vatican City |
472 |
# See Europe/Rome. |
473 |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica |
474 |
index 13ec081c7e0..3c0e0e2061c 100644 |
475 |
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica |
476 |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica |
477 |
@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 |
478 |
# for America/Santiago will start on midnight of September 11th; |
479 |
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas) |
480 |
# will keep UTC -3 "indefinitely"... This is because on September 4th |
481 |
-# we will have a voting whether to approve a new Constitution.... |
482 |
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/ |
483 |
+# we will have a voting whether to approve a new Constitution. |
484 |
+# |
485 |
+# From Eduardo Romero Urra (2022-08-17): |
486 |
+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf |
487 |
+# |
488 |
+# From Paul Eggert (2022-08-17): |
489 |
+# Although the presidential decree stops at fall 2026, assume that |
490 |
+# similar DST rules will continue thereafter. |
491 |
|
492 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S |
493 |
Rule Chile 1927 1931 - Sep 1 0:00 1:00 - |
494 |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab |
495 |
index 51b65fa273c..ee025196e50 100644 |
496 |
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab |
497 |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab |
498 |
@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti |
499 |
TW +2503+12130 Asia/Taipei |
500 |
TZ -0648+03917 Africa/Dar_es_Salaam |
501 |
UA +5026+03031 Europe/Kyiv Ukraine (most areas) |
502 |
-UA +4837+02218 Europe/Uzhgorod Transcarpathia |
503 |
-UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk |
504 |
UG +0019+03225 Africa/Kampala |
505 |
UM +2813-17722 Pacific/Midway Midway Islands |
506 |
UM +1917+16637 Pacific/Wake Wake Island |