|
 |
65e86d |
commit 8589b1229cffb9a0ab00baf62ce2d4376d31b055
|
|
|
65e86d |
Author: Andrew John Hughes <andrew@openjdk.org>
|
|
|
65e86d |
Date: Fri Oct 14 22:55:39 2022 +0100
|
|
|
65e86d |
|
|
|
65e86d |
Backport f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b
|
|
|
65e86d |
|
|
|
65e86d |
diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION
|
|
|
65e86d |
index decb8716b22..889d0e6dad7 100644
|
|
|
65e86d |
--- a/jdk/make/data/tzdata/VERSION
|
|
|
65e86d |
+++ b/jdk/make/data/tzdata/VERSION
|
|
|
65e86d |
@@ -21,4 +21,4 @@
|
|
|
65e86d |
# or visit www.oracle.com if you need additional information or have any
|
|
|
65e86d |
# questions.
|
|
|
65e86d |
#
|
|
|
65e86d |
-tzdata2022c
|
|
|
65e86d |
+tzdata2022d
|
|
|
65e86d |
diff --git a/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia
|
|
|
65e86d |
index 6cb6d2c57cf..1dc7d34f88e 100644
|
|
|
65e86d |
--- a/jdk/make/data/tzdata/asia
|
|
|
65e86d |
+++ b/jdk/make/data/tzdata/asia
|
|
|
65e86d |
@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
65e86d |
# The winter time in 2015 started on October 23 at 01:00.
|
|
|
65e86d |
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
|
|
|
65e86d |
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
|
|
|
65e86d |
-#
|
|
|
65e86d |
-# From Paul Eggert (2019-04-10):
|
|
|
65e86d |
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
|
|
|
65e86d |
-# preceding March's last Sunday (i.e., Sat>=24).
|
|
|
65e86d |
|
|
|
65e86d |
# From P Chan (2021-10-18):
|
|
|
65e86d |
# http://wafa.ps/Pages/Details/34701
|
|
|
65e86d |
@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
65e86d |
# From Heba Hamad (2022-03-10):
|
|
|
65e86d |
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
|
|
|
65e86d |
|
|
|
65e86d |
+# From Heba Hamad (2022-08-30):
|
|
|
65e86d |
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
|
|
|
65e86d |
+# 60 minutes backwards. Also the state of Palestine adopted the summer
|
|
|
65e86d |
+# and winter time for the years: 2023,2024,2025,2026 ...
|
|
|
65e86d |
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
|
|
|
65e86d |
+# (2022-08-31): ... the Saturday before the last Sunday in March and October
|
|
|
65e86d |
+# at 2:00 AM ,for the years from 2023 to 2026.
|
|
|
65e86d |
+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
|
|
|
65e86d |
+#
|
|
|
65e86d |
+# From Paul Eggert (2022-08-31):
|
|
|
65e86d |
+# For now, assume that this rule will also be used after 2026.
|
|
|
65e86d |
+
|
|
|
65e86d |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
65e86d |
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
|
|
65e86d |
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
|
|
|
65e86d |
@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -
|
|
|
65e86d |
Rule Palestine 2014 only - Oct 24 0:00 0 -
|
|
|
65e86d |
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
|
|
|
65e86d |
Rule Palestine 2015 only - Oct 23 1:00 0 -
|
|
|
65e86d |
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
|
|
|
65e86d |
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
|
|
|
65e86d |
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -
|
|
|
65e86d |
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
|
|
|
65e86d |
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
|
|
|
65e86d |
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -
|
|
|
65e86d |
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
|
|
|
65e86d |
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
|
|
65e86d |
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -
|
|
|
65e86d |
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2021 only - Oct 29 1:00 0 -
|
|
|
65e86d |
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
|
|
|
65e86d |
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
|
|
|
65e86d |
|
|
|
65e86d |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
65e86d |
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
|
|
65e86d |
diff --git a/jdk/make/data/tzdata/backward b/jdk/make/data/tzdata/backward
|
|
|
65e86d |
index d4a29e8cf29..7765d99aedf 100644
|
|
|
65e86d |
--- a/jdk/make/data/tzdata/backward
|
|
|
65e86d |
+++ b/jdk/make/data/tzdata/backward
|
|
|
65e86d |
@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT
|
|
|
65e86d |
Link Europe/London Europe/Belfast
|
|
|
65e86d |
Link Europe/Kyiv Europe/Kiev
|
|
|
65e86d |
Link Europe/Chisinau Europe/Tiraspol
|
|
|
65e86d |
+Link Europe/Kyiv Europe/Uzhgorod
|
|
|
65e86d |
+Link Europe/Kyiv Europe/Zaporozhye
|
|
|
65e86d |
Link Europe/London GB
|
|
|
65e86d |
Link Europe/London GB-Eire
|
|
|
65e86d |
Link Etc/GMT GMT+0
|
|
|
65e86d |
diff --git a/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe
|
|
|
65e86d |
index f7eb7a387aa..9e0a538f86d 100644
|
|
|
65e86d |
--- a/jdk/make/data/tzdata/europe
|
|
|
65e86d |
+++ b/jdk/make/data/tzdata/europe
|
|
|
65e86d |
@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
|
|
|
65e86d |
# From Alexander Krivenyshev (2014-03-17):
|
|
|
65e86d |
# time change at 2:00 (2am) on March 30, 2014
|
|
|
65e86d |
# https://vz.ru/news/2014/3/17/677464.html
|
|
|
65e86d |
-# From Paul Eggert (2014-03-30):
|
|
|
65e86d |
-# Simferopol and Sevastopol reportedly changed their central town clocks
|
|
|
65e86d |
-# late the previous day, but this appears to have been ceremonial
|
|
|
65e86d |
-# and the discrepancies are small enough to not worry about.
|
|
|
65e86d |
+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
|
|
|
65e86d |
+# The clocks at the railway station in Simferopol were put forward from 22:00
|
|
|
65e86d |
+# to 24:00 the previous day in a "symbolic ceremony"; however, per
|
|
|
65e86d |
+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
|
|
|
65e86d |
+# time switch at 2am" on Sunday.
|
|
|
65e86d |
+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
|
|
|
65e86d |
+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
|
|
|
65e86d |
+# https://www.bbc.com/news/av/world-europe-26806583
|
|
|
65e86d |
2:00 EU EE%sT 2014 Mar 30 2:00
|
|
|
65e86d |
4:00 - MSK 2014 Oct 26 2:00s
|
|
|
65e86d |
3:00 - MSK
|
|
|
65e86d |
@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
|
65e86d |
# US colleague David Cochrane) are still trying to get more
|
|
|
65e86d |
# information upon these local deviations from Kiev rules.
|
|
|
65e86d |
#
|
|
|
65e86d |
-# From Paul Eggert (2022-02-08):
|
|
|
65e86d |
-# For now, assume that Ukraine's other three zones followed the same rules,
|
|
|
65e86d |
+# From Paul Eggert (2022-08-27):
|
|
|
65e86d |
+# For now, assume that Ukraine's zones all followed the same rules,
|
|
|
65e86d |
# except that Crimea switched to Moscow time in 1994 as described elsewhere.
|
|
|
65e86d |
|
|
|
65e86d |
# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
|
|
|
65e86d |
@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
|
65e86d |
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
|
|
|
65e86d |
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
|
|
|
65e86d |
|
|
|
65e86d |
-# From Paul Eggert (2022-04-12):
|
|
|
65e86d |
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
|
|
|
65e86d |
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
|
|
|
65e86d |
-# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev,
|
|
|
65e86d |
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
|
|
|
65e86d |
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
|
|
|
65e86d |
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
|
|
|
65e86d |
-# certainly wrong as a transliteration of the Czech "Praha".
|
|
|
65e86d |
-# English-language spelling of Ukrainian names is in flux, and
|
|
|
65e86d |
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
|
|
|
65e86d |
-# common in English; in the meantime, do not change these
|
|
|
65e86d |
-# English spellings as that means less disruption for our users.
|
|
|
65e86d |
-
|
|
|
65e86d |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
65e86d |
-# This represents most of Ukraine. See above for the spelling of "Kyiv".
|
|
|
65e86d |
Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
|
65e86d |
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time
|
|
|
65e86d |
2:00 - EET 1930 Jun 21
|
|
|
65e86d |
@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
|
65e86d |
2:00 1:00 EEST 1991 Sep 29 3:00
|
|
|
65e86d |
2:00 C-Eur EE%sT 1996 May 13
|
|
|
65e86d |
2:00 EU EE%sT
|
|
|
65e86d |
-# Transcarpathia used CET 1990/1991.
|
|
|
65e86d |
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
|
|
|
65e86d |
-# "Uzhgorod" is more common in English.
|
|
|
65e86d |
-Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
|
|
|
65e86d |
- 1:00 - CET 1940
|
|
|
65e86d |
- 1:00 C-Eur CE%sT 1944 Oct
|
|
|
65e86d |
- 1:00 1:00 CEST 1944 Oct 26
|
|
|
65e86d |
- 1:00 - CET 1945 Jun 29
|
|
|
65e86d |
- 3:00 Russia MSK/MSD 1990
|
|
|
65e86d |
- 3:00 - MSK 1990 Jul 1 2:00
|
|
|
65e86d |
- 1:00 - CET 1991 Mar 31 3:00
|
|
|
65e86d |
- 2:00 - EET 1992 Mar 20
|
|
|
65e86d |
- 2:00 C-Eur EE%sT 1996 May 13
|
|
|
65e86d |
- 2:00 EU EE%sT
|
|
|
65e86d |
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
|
|
|
65e86d |
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
|
|
|
65e86d |
-# "Zaporozh'ye" is more common in English. Use the common English
|
|
|
65e86d |
-# spelling, except omit the apostrophe as it is not allowed in
|
|
|
65e86d |
-# portable Posix file names.
|
|
|
65e86d |
-Zone Europe/Zaporozhye 2:20:40 - LMT 1880
|
|
|
65e86d |
- 2:20 - +0220 1924 May 2
|
|
|
65e86d |
- 2:00 - EET 1930 Jun 21
|
|
|
65e86d |
- 3:00 - MSK 1941 Aug 25
|
|
|
65e86d |
- 1:00 C-Eur CE%sT 1943 Oct 25
|
|
|
65e86d |
- 3:00 Russia MSK/MSD 1991 Mar 31 2:00
|
|
|
65e86d |
- 2:00 E-Eur EE%sT 1992 Mar 20
|
|
|
65e86d |
- 2:00 C-Eur EE%sT 1996 May 13
|
|
|
65e86d |
- 2:00 EU EE%sT
|
|
|
65e86d |
|
|
|
65e86d |
# Vatican City
|
|
|
65e86d |
# See Europe/Rome.
|
|
|
65e86d |
diff --git a/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica
|
|
|
65e86d |
index 13ec081c7e0..3c0e0e2061c 100644
|
|
|
65e86d |
--- a/jdk/make/data/tzdata/southamerica
|
|
|
65e86d |
+++ b/jdk/make/data/tzdata/southamerica
|
|
|
65e86d |
@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
|
|
65e86d |
# for America/Santiago will start on midnight of September 11th;
|
|
|
65e86d |
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
|
|
|
65e86d |
# will keep UTC -3 "indefinitely"... This is because on September 4th
|
|
|
65e86d |
-# we will have a voting whether to approve a new Constitution....
|
|
|
65e86d |
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
|
|
|
65e86d |
+# we will have a voting whether to approve a new Constitution.
|
|
|
65e86d |
+#
|
|
|
65e86d |
+# From Eduardo Romero Urra (2022-08-17):
|
|
|
65e86d |
+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
|
|
|
65e86d |
+#
|
|
|
65e86d |
+# From Paul Eggert (2022-08-17):
|
|
|
65e86d |
+# Although the presidential decree stops at fall 2026, assume that
|
|
|
65e86d |
+# similar DST rules will continue thereafter.
|
|
|
65e86d |
|
|
|
65e86d |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
65e86d |
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
|
|
|
65e86d |
diff --git a/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab
|
|
|
65e86d |
index 51b65fa273c..ee025196e50 100644
|
|
|
65e86d |
--- a/jdk/make/data/tzdata/zone.tab
|
|
|
65e86d |
+++ b/jdk/make/data/tzdata/zone.tab
|
|
|
65e86d |
@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti
|
|
|
65e86d |
TW +2503+12130 Asia/Taipei
|
|
|
65e86d |
TZ -0648+03917 Africa/Dar_es_Salaam
|
|
|
65e86d |
UA +5026+03031 Europe/Kyiv Ukraine (most areas)
|
|
|
65e86d |
-UA +4837+02218 Europe/Uzhgorod Transcarpathia
|
|
|
65e86d |
-UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk
|
|
|
65e86d |
UG +0019+03225 Africa/Kampala
|
|
|
65e86d |
UM +2813-17722 Pacific/Midway Midway Islands
|
|
|
65e86d |
UM +1917+16637 Pacific/Wake Wake Island
|
|
|
65e86d |
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
|
65e86d |
index 43bddd5859a..4b84cda3067 100644
|
|
|
65e86d |
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
|
65e86d |
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
|
65e86d |
@@ -573,12 +573,8 @@ public final class ZoneInfoFile {
|
|
|
65e86d |
// we can then pass in the dom = -1, dow > 0 into ZoneInfo
|
|
|
65e86d |
//
|
|
|
65e86d |
// hacking, assume the >=24 is the result of ZRB optimization for
|
|
|
65e86d |
- // "last", it works for now. From tzdata2020d this hacking
|
|
|
65e86d |
- // will not work for Asia/Gaza and Asia/Hebron which follow
|
|
|
65e86d |
- // Palestine DST rules.
|
|
|
65e86d |
- if (dom < 0 || dom >= 24 &&
|
|
|
65e86d |
- !(zoneId.equals("Asia/Gaza") ||
|
|
|
65e86d |
- zoneId.equals("Asia/Hebron"))) {
|
|
|
65e86d |
+ // "last", it works for now.
|
|
|
65e86d |
+ if (dom < 0 || dom >= 24) {
|
|
|
65e86d |
params[1] = -1;
|
|
|
65e86d |
params[2] = toCalendarDOW[dow];
|
|
|
65e86d |
} else {
|
|
|
65e86d |
@@ -600,7 +596,6 @@ public final class ZoneInfoFile {
|
|
|
65e86d |
params[7] = 0;
|
|
|
65e86d |
} else {
|
|
|
65e86d |
// hacking: see comment above
|
|
|
65e86d |
- // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e
|
|
|
65e86d |
if (dom < 0 || dom >= 24) {
|
|
|
65e86d |
params[6] = -1;
|
|
|
65e86d |
params[7] = toCalendarDOW[dow];
|
|
|
65e86d |
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
65e86d |
index c32bee39fba..71470168456 100644
|
|
|
65e86d |
--- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
65e86d |
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
65e86d |
@@ -1 +1 @@
|
|
|
65e86d |
-tzdata2022c
|
|
|
65e86d |
+tzdata2022d
|
|
|
65e86d |
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
|
65e86d |
index a5e6428a3f5..e3ce742f887 100644
|
|
|
65e86d |
--- a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
|
65e86d |
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
|
65e86d |
@@ -183,6 +183,8 @@ Link Etc/UTC Etc/UCT
|
|
|
65e86d |
Link Europe/London Europe/Belfast
|
|
|
65e86d |
Link Europe/Kyiv Europe/Kiev
|
|
|
65e86d |
Link Europe/Chisinau Europe/Tiraspol
|
|
|
65e86d |
+Link Europe/Kyiv Europe/Uzhgorod
|
|
|
65e86d |
+Link Europe/Kyiv Europe/Zaporozhye
|
|
|
65e86d |
Link Europe/London GB
|
|
|
65e86d |
Link Europe/London GB-Eire
|
|
|
65e86d |
Link Etc/GMT GMT+0
|
|
|
65e86d |
diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
65e86d |
index fc148537f1f..b3823958ae4 100644
|
|
|
65e86d |
--- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
65e86d |
+++ b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
65e86d |
@@ -163,11 +163,9 @@ Europe/Simferopol MSK
|
|
|
65e86d |
Europe/Sofia EET EEST
|
|
|
65e86d |
Europe/Tallinn EET EEST
|
|
|
65e86d |
Europe/Tirane CET CEST
|
|
|
65e86d |
-Europe/Uzhgorod EET EEST
|
|
|
65e86d |
Europe/Vienna CET CEST
|
|
|
65e86d |
Europe/Vilnius EET EEST
|
|
|
65e86d |
Europe/Warsaw CET CEST
|
|
|
65e86d |
-Europe/Zaporozhye EET EEST
|
|
|
65e86d |
Europe/Zurich CET CEST
|
|
|
65e86d |
HST HST
|
|
|
65e86d |
MET MET MEST
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
|
|
|
65e86d |
index 3aad69f8118..c682531d4bd 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java
|
|
|
65e86d |
@@ -173,10 +173,19 @@ public class TestZoneInfo310 {
|
|
|
65e86d |
* Temporary ignoring the failing TimeZones which are having zone
|
|
|
65e86d |
* rules defined till year 2037 and/or above and have negative DST
|
|
|
65e86d |
* save time in IANA tzdata. This bug is tracked via JDK-8223388.
|
|
|
65e86d |
+ *
|
|
|
65e86d |
+ * Tehran/Iran rule has rules beyond 2037, in which javazic assumes
|
|
|
65e86d |
+ * to be the last year. Thus javazic's rule is based on year 2037
|
|
|
65e86d |
+ * (Mar 20th/Sep 20th are the cutover dates), while the real rule
|
|
|
65e86d |
+ * has year 2087 where Mar 21st/Sep 21st are the cutover dates.
|
|
|
65e86d |
*/
|
|
|
65e86d |
- if (zid.equals("Africa/Casablanca") || zid.equals("Africa/El_Aaiun")
|
|
|
65e86d |
- || zid.equals("Asia/Tehran") || zid.equals("Iran")) {
|
|
|
65e86d |
- continue;
|
|
|
65e86d |
+ if (zid.equals("Africa/Casablanca") || // uses "Morocco" rule
|
|
|
65e86d |
+ zid.equals("Africa/El_Aaiun") || // uses "Morocco" rule
|
|
|
65e86d |
+ zid.equals("Asia/Tehran") || // last rule mismatch
|
|
|
65e86d |
+ zid.equals("Asia/Gaza") || // uses "Palestine" rule
|
|
|
65e86d |
+ zid.equals("Asia/Hebron") || // uses "Palestine" rule
|
|
|
65e86d |
+ zid.equals("Iran")) { // last rule mismatch
|
|
|
65e86d |
+ continue;
|
|
|
65e86d |
}
|
|
|
65e86d |
if (! zi.equalsTo(ziOLD)) {
|
|
|
65e86d |
System.out.println(zi.diffsTo(ziOLD));
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
|
65e86d |
index decb8716b22..889d0e6dad7 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION
|
|
|
65e86d |
@@ -21,4 +21,4 @@
|
|
|
65e86d |
# or visit www.oracle.com if you need additional information or have any
|
|
|
65e86d |
# questions.
|
|
|
65e86d |
#
|
|
|
65e86d |
-tzdata2022c
|
|
|
65e86d |
+tzdata2022d
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
|
65e86d |
index 6cb6d2c57cf..1dc7d34f88e 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia
|
|
|
65e86d |
@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
65e86d |
# The winter time in 2015 started on October 23 at 01:00.
|
|
|
65e86d |
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
|
|
|
65e86d |
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
|
|
|
65e86d |
-#
|
|
|
65e86d |
-# From Paul Eggert (2019-04-10):
|
|
|
65e86d |
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
|
|
|
65e86d |
-# preceding March's last Sunday (i.e., Sat>=24).
|
|
|
65e86d |
|
|
|
65e86d |
# From P Chan (2021-10-18):
|
|
|
65e86d |
# http://wafa.ps/Pages/Details/34701
|
|
|
65e86d |
@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
65e86d |
# From Heba Hamad (2022-03-10):
|
|
|
65e86d |
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
|
|
|
65e86d |
|
|
|
65e86d |
+# From Heba Hamad (2022-08-30):
|
|
|
65e86d |
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
|
|
|
65e86d |
+# 60 minutes backwards. Also the state of Palestine adopted the summer
|
|
|
65e86d |
+# and winter time for the years: 2023,2024,2025,2026 ...
|
|
|
65e86d |
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
|
|
|
65e86d |
+# (2022-08-31): ... the Saturday before the last Sunday in March and October
|
|
|
65e86d |
+# at 2:00 AM ,for the years from 2023 to 2026.
|
|
|
65e86d |
+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
|
|
|
65e86d |
+#
|
|
|
65e86d |
+# From Paul Eggert (2022-08-31):
|
|
|
65e86d |
+# For now, assume that this rule will also be used after 2026.
|
|
|
65e86d |
+
|
|
|
65e86d |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
65e86d |
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
|
|
65e86d |
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
|
|
|
65e86d |
@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -
|
|
|
65e86d |
Rule Palestine 2014 only - Oct 24 0:00 0 -
|
|
|
65e86d |
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
|
|
|
65e86d |
Rule Palestine 2015 only - Oct 23 1:00 0 -
|
|
|
65e86d |
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
|
|
|
65e86d |
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
|
|
|
65e86d |
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -
|
|
|
65e86d |
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
|
|
|
65e86d |
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
|
|
|
65e86d |
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -
|
|
|
65e86d |
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
|
|
|
65e86d |
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
|
|
65e86d |
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -
|
|
|
65e86d |
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2021 only - Oct 29 1:00 0 -
|
|
|
65e86d |
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
|
|
65e86d |
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
|
|
|
65e86d |
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
|
|
|
65e86d |
|
|
|
65e86d |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
65e86d |
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward
|
|
|
65e86d |
index d4a29e8cf29..7765d99aedf 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward
|
|
|
65e86d |
@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT
|
|
|
65e86d |
Link Europe/London Europe/Belfast
|
|
|
65e86d |
Link Europe/Kyiv Europe/Kiev
|
|
|
65e86d |
Link Europe/Chisinau Europe/Tiraspol
|
|
|
65e86d |
+Link Europe/Kyiv Europe/Uzhgorod
|
|
|
65e86d |
+Link Europe/Kyiv Europe/Zaporozhye
|
|
|
65e86d |
Link Europe/London GB
|
|
|
65e86d |
Link Europe/London GB-Eire
|
|
|
65e86d |
Link Etc/GMT GMT+0
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
|
65e86d |
index f7eb7a387aa..9e0a538f86d 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe
|
|
|
65e86d |
@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880
|
|
|
65e86d |
# From Alexander Krivenyshev (2014-03-17):
|
|
|
65e86d |
# time change at 2:00 (2am) on March 30, 2014
|
|
|
65e86d |
# https://vz.ru/news/2014/3/17/677464.html
|
|
|
65e86d |
-# From Paul Eggert (2014-03-30):
|
|
|
65e86d |
-# Simferopol and Sevastopol reportedly changed their central town clocks
|
|
|
65e86d |
-# late the previous day, but this appears to have been ceremonial
|
|
|
65e86d |
-# and the discrepancies are small enough to not worry about.
|
|
|
65e86d |
+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
|
|
|
65e86d |
+# The clocks at the railway station in Simferopol were put forward from 22:00
|
|
|
65e86d |
+# to 24:00 the previous day in a "symbolic ceremony"; however, per
|
|
|
65e86d |
+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
|
|
|
65e86d |
+# time switch at 2am" on Sunday.
|
|
|
65e86d |
+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
|
|
|
65e86d |
+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
|
|
|
65e86d |
+# https://www.bbc.com/news/av/world-europe-26806583
|
|
|
65e86d |
2:00 EU EE%sT 2014 Mar 30 2:00
|
|
|
65e86d |
4:00 - MSK 2014 Oct 26 2:00s
|
|
|
65e86d |
3:00 - MSK
|
|
|
65e86d |
@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
|
65e86d |
# US colleague David Cochrane) are still trying to get more
|
|
|
65e86d |
# information upon these local deviations from Kiev rules.
|
|
|
65e86d |
#
|
|
|
65e86d |
-# From Paul Eggert (2022-02-08):
|
|
|
65e86d |
-# For now, assume that Ukraine's other three zones followed the same rules,
|
|
|
65e86d |
+# From Paul Eggert (2022-08-27):
|
|
|
65e86d |
+# For now, assume that Ukraine's zones all followed the same rules,
|
|
|
65e86d |
# except that Crimea switched to Moscow time in 1994 as described elsewhere.
|
|
|
65e86d |
|
|
|
65e86d |
# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
|
|
|
65e86d |
@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
|
|
|
65e86d |
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
|
|
|
65e86d |
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
|
|
|
65e86d |
|
|
|
65e86d |
-# From Paul Eggert (2022-04-12):
|
|
|
65e86d |
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
|
|
|
65e86d |
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
|
|
|
65e86d |
-# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev,
|
|
|
65e86d |
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
|
|
|
65e86d |
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
|
|
|
65e86d |
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
|
|
|
65e86d |
-# certainly wrong as a transliteration of the Czech "Praha".
|
|
|
65e86d |
-# English-language spelling of Ukrainian names is in flux, and
|
|
|
65e86d |
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
|
|
|
65e86d |
-# common in English; in the meantime, do not change these
|
|
|
65e86d |
-# English spellings as that means less disruption for our users.
|
|
|
65e86d |
-
|
|
|
65e86d |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
65e86d |
-# This represents most of Ukraine. See above for the spelling of "Kyiv".
|
|
|
65e86d |
Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
|
65e86d |
2:02:04 - KMT 1924 May 2 # Kyiv Mean Time
|
|
|
65e86d |
2:00 - EET 1930 Jun 21
|
|
|
65e86d |
@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880
|
|
|
65e86d |
2:00 1:00 EEST 1991 Sep 29 3:00
|
|
|
65e86d |
2:00 C-Eur EE%sT 1996 May 13
|
|
|
65e86d |
2:00 EU EE%sT
|
|
|
65e86d |
-# Transcarpathia used CET 1990/1991.
|
|
|
65e86d |
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
|
|
|
65e86d |
-# "Uzhgorod" is more common in English.
|
|
|
65e86d |
-Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
|
|
|
65e86d |
- 1:00 - CET 1940
|
|
|
65e86d |
- 1:00 C-Eur CE%sT 1944 Oct
|
|
|
65e86d |
- 1:00 1:00 CEST 1944 Oct 26
|
|
|
65e86d |
- 1:00 - CET 1945 Jun 29
|
|
|
65e86d |
- 3:00 Russia MSK/MSD 1990
|
|
|
65e86d |
- 3:00 - MSK 1990 Jul 1 2:00
|
|
|
65e86d |
- 1:00 - CET 1991 Mar 31 3:00
|
|
|
65e86d |
- 2:00 - EET 1992 Mar 20
|
|
|
65e86d |
- 2:00 C-Eur EE%sT 1996 May 13
|
|
|
65e86d |
- 2:00 EU EE%sT
|
|
|
65e86d |
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
|
|
|
65e86d |
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
|
|
|
65e86d |
-# "Zaporozh'ye" is more common in English. Use the common English
|
|
|
65e86d |
-# spelling, except omit the apostrophe as it is not allowed in
|
|
|
65e86d |
-# portable Posix file names.
|
|
|
65e86d |
-Zone Europe/Zaporozhye 2:20:40 - LMT 1880
|
|
|
65e86d |
- 2:20 - +0220 1924 May 2
|
|
|
65e86d |
- 2:00 - EET 1930 Jun 21
|
|
|
65e86d |
- 3:00 - MSK 1941 Aug 25
|
|
|
65e86d |
- 1:00 C-Eur CE%sT 1943 Oct 25
|
|
|
65e86d |
- 3:00 Russia MSK/MSD 1991 Mar 31 2:00
|
|
|
65e86d |
- 2:00 E-Eur EE%sT 1992 Mar 20
|
|
|
65e86d |
- 2:00 C-Eur EE%sT 1996 May 13
|
|
|
65e86d |
- 2:00 EU EE%sT
|
|
|
65e86d |
|
|
|
65e86d |
# Vatican City
|
|
|
65e86d |
# See Europe/Rome.
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
|
|
|
65e86d |
index 13ec081c7e0..3c0e0e2061c 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica
|
|
|
65e86d |
@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
|
|
|
65e86d |
# for America/Santiago will start on midnight of September 11th;
|
|
|
65e86d |
# and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
|
|
|
65e86d |
# will keep UTC -3 "indefinitely"... This is because on September 4th
|
|
|
65e86d |
-# we will have a voting whether to approve a new Constitution....
|
|
|
65e86d |
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
|
|
|
65e86d |
+# we will have a voting whether to approve a new Constitution.
|
|
|
65e86d |
+#
|
|
|
65e86d |
+# From Eduardo Romero Urra (2022-08-17):
|
|
|
65e86d |
+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
|
|
|
65e86d |
+#
|
|
|
65e86d |
+# From Paul Eggert (2022-08-17):
|
|
|
65e86d |
+# Although the presidential decree stops at fall 2026, assume that
|
|
|
65e86d |
+# similar DST rules will continue thereafter.
|
|
|
65e86d |
|
|
|
65e86d |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
65e86d |
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
|
|
|
65e86d |
diff --git a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
|
|
|
65e86d |
index 51b65fa273c..ee025196e50 100644
|
|
|
65e86d |
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
|
|
|
65e86d |
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab
|
|
|
65e86d |
@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti
|
|
|
65e86d |
TW +2503+12130 Asia/Taipei
|
|
|
65e86d |
TZ -0648+03917 Africa/Dar_es_Salaam
|
|
|
65e86d |
UA +5026+03031 Europe/Kyiv Ukraine (most areas)
|
|
|
65e86d |
-UA +4837+02218 Europe/Uzhgorod Transcarpathia
|
|
|
65e86d |
-UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk
|
|
|
65e86d |
UG +0019+03225 Africa/Kampala
|
|
|
65e86d |
UM +2813-17722 Pacific/Midway Midway Islands
|
|
|
65e86d |
UM +1917+16637 Pacific/Wake Wake Island
|